diff --git a/sql/characters.sql b/sql/characters.sql index 53674e12b..4837a0b4e 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -2,7 +2,7 @@ -- -- Host: localhost Database: characters -- ------------------------------------------------------ --- Server version 5.0.45-Debian_1ubuntu3.1-log +-- Server version 5.0.45-Debian_1ubuntu3.1-log /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/sql/mangos.sql b/sql/mangos.sql index dd3363596..fbf2cd359 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -2,7 +2,7 @@ -- -- Host: localhost Database: mangos -- ------------------------------------------------------ --- Server version 5.0.56-nt +-- Server version 5.0.56-nt /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/sql/mangos_spell_check.sql b/sql/mangos_spell_check.sql index e274567a4..456fefa7c 100644 --- a/sql/mangos_spell_check.sql +++ b/sql/mangos_spell_check.sql @@ -17,7 +17,7 @@ /* Current table fill progress state: */ /* SpellEffect.cpp from start until end of Spell::EffectTameCreature */ -/* Spell.cpp */ +/* Spell.cpp */ /* at 6ee669d1d52581d4707c6475b512e6cc53844121 [9944] state */ DROP TABLE IF EXISTS spell_check; @@ -616,7 +616,7 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas /* sorted by spell names */ /*id fm familyMaskA fmMaskB icon vis cat eff aur ef name code */ -( 0,15, -1, -1,2710, -1, -1, -1, 4,-1,'Annihilation', 'Spell::EffectDummy'), +( 0,15, -1, -1,2710, -1, -1, -1, 4,-1,'Annihilation', 'Spell::EffectDummy'), ( 0, 3,0x0000000020000000,0x00000000, -1, -1, -1, 2, -1,-1,'Arcane Blast', 'Spell::EffectSchoolDMG'), ( 0, 3,0x0000000000200080,0x00000000, -1, -1, -1, -1, -1,-1,'Arcane Missles / Blizzard', 'Spell::prepareDataForTriggerSystem'), ( 0, 9,0x0000000000000800,0x00000000, -1, -1, -1, 2, -1,-1,'Arcane Shot', 'Spell::EffectSchoolDMG'), @@ -632,8 +632,8 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas ( 0,11,0x0000000004000000,0x00000000,1673, -1, -1, 3, -1,-1,'Cleansing Totem', 'Spell::EffectDummy'), ( 0, 3,0x0000000200000000,0x00000008, -1, -1, -1, -1, -1,-1,'Clearcasting', 'Spell::prepareDataForTriggerSystem'), ( 0, 4,0x0000000004000000,0x00000000, -1, -1, -1, 3, -1,-1,'Concussion Blow', 'Spell::EffectDummy'), -( 0, 3, -1, -1, -1, -1, -1, 3, -1, 1,'Conjure Mana Gem', 'Spell::EffectDummy'), /*part 1*/ -( 0, 3, -1, -1, -1, -1, -1, 24, -1, 0,'Conjure Mana Gem', 'Spell::EffectDummy'), /*part 2*/ +( 0, 3, -1, -1, -1, -1, -1, 3, -1, 1,'Conjure Mana Gem', 'Spell::EffectDummy'), /*part 1*/ +( 0, 3, -1, -1, -1, -1, -1, 24, -1, 0,'Conjure Mana Gem', 'Spell::EffectDummy'), /*part 2*/ ( 0, 3, -1, -1, -1, -1, -1, 24, -1, 0,'Conjure Mana Gem', 'Spell::CheckItems'), ( 0, 9,0x0008000000000000,0x00000000, -1, -1, -1, 2, -1,-1,'Counterattack', 'Spell::EffectSchoolDMG'), ( 0, 5, -1, -1, -1, -1,1179, -1, -1,-1,'Curse of Doom', 'Spell::CheckTargetCreatureType'), @@ -661,7 +661,7 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas ( 0, 5,0x0004000000000000,0x00000000,3172, -1, -1, -1, 4,-1,'Haunt', 'Spell::DoAllEffectOnTarget'), ( 0,11,0x0000000000002000,0x00000000, -1, -1, -1, 3, -1,-1,'Healing Stream Totem', 'Spell::EffectDummy'), ( 0, 4,0x0000800000000060,0x00000000, -1, -1, -1, -1, -1,-1,'Hellfire Effect / Rain of Fire / Seed of Corruption','Spell::prepareDataForTriggerSystem'), -( 0, 8,0x0000000002800000,0x00000000, -1, -1, -1, -1, -1,-1,'Hemorrhage', 'Spell::EffectWeaponDmg'), +( 0, 8,0x0000000002800000,0x00000000, -1, -1, -1, -1, -1,-1,'Hemorrhage', 'Spell::EffectWeaponDmg'), ( 0, 4,0x0000000100000000,0x00000000, -1, -1, -1, 2, -1,-1,'Heroic Throw', 'Spell::EffectSchoolDMG'), ( 0,10, -1, -1, 156, -1, -1, 3, -1,-1,'Holy Shock', 'Spell::EffectDummy'), ( 0,-1, -1, -1, 156, -1, -1, 3, -1,-1,'Holy Shock', 'Spell::CheckCast'), @@ -709,7 +709,7 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas ( 0, 7,0x0000000000000010,0x00000000, -1, -1, -1, -1, 8,-1,'Rejuvenation', 'Spell::EffectHeal'), ( 0, 3,0x0000010000000000,0x00000000, -1, -1, -1, -1, -1,-1,'Replenish Mana', 'Spell::prepareDataForTriggerSystem'), ( 0,11,0x0000000000000000,0x00000010, -1, -1, -1, -1, 8,-1,'Riptide', 'Spell::EffectHeal'), -( 0,11, -1, -1, 338, -1, -1, -1, 4, 1,'Restorative Totems', 'Spell::EffectSchoolDMG'), /*part 1*/ +( 0,11, -1, -1, 338, -1, -1, -1, 4, 1,'Restorative Totems', 'Spell::EffectSchoolDMG'), /*part 1*/ ( 0, 4,0x0000000000000400,0x00000000, -1, -1, -1, 2, -1,-1,'Revenge', 'Spell::EffectSchoolDMG'), ( 0,11,0x0000000000400000,0x00000000, -1, -1, -1, 54, -1,-1,'Rockbiter Weapon', 'Spell::EffectEnchantItemTmp'), ( 0,15,0x0800000000000000,0x00000000, -1, -1, -1, -1, -1,-1,'Scourge Strike', 'Spell::DoAllEffectOnTarget'), diff --git a/sql/postgre_compatibility_addon.sql b/sql/postgre_compatibility_addon.sql index 105d65fab..fa00d491c 100644 --- a/sql/postgre_compatibility_addon.sql +++ b/sql/postgre_compatibility_addon.sql @@ -8,19 +8,19 @@ -- no params CREATE OR REPLACE FUNCTION unix_timestamp() RETURNS bigint AS ' - SELECT EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0))::bigint AS result; + SELECT EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0))::bigint AS result; ' LANGUAGE 'SQL'; -- timestamp without time zone (i.e. 1973-11-29 21:33:09) CREATE OR REPLACE FUNCTION unix_timestamp(timestamp) RETURNS bigint AS ' - SELECT EXTRACT(EPOCH FROM $1)::bigint AS result; + SELECT EXTRACT(EPOCH FROM $1)::bigint AS result; ' LANGUAGE 'SQL'; -- timestamp with time zone (i.e. 1973-11-29 21:33:09+01) CREATE OR REPLACE FUNCTION unix_timestamp(timestamp WITH time zone) RETURNS bigint AS ' - SELECT EXTRACT(EPOCH FROM $1)::bigint AS result; + SELECT EXTRACT(EPOCH FROM $1)::bigint AS result; ' LANGUAGE 'SQL'; CREATE OR REPLACE FUNCTION from_unixtime(integer) RETURNS timestamp AS ' - SELECT to_timestamp($1)::timestamp AS result + SELECT to_timestamp($1)::timestamp AS result ' LANGUAGE 'SQL'; diff --git a/sql/realmd.sql b/sql/realmd.sql index c25bfa4de..0fe246f44 100644 --- a/sql/realmd.sql +++ b/sql/realmd.sql @@ -2,7 +2,7 @@ -- -- Host: localhost Database: realmd -- ------------------------------------------------------ --- Server version 5.0.45-Debian_1ubuntu3.1-log +-- Server version 5.0.45-Debian_1ubuntu3.1-log /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/sql/updates/0.14/7988_07_characters_characters.sql b/sql/updates/0.14/7988_07_characters_characters.sql index 246a93a0e..ef72b5fc5 100644 --- a/sql/updates/0.14/7988_07_characters_characters.sql +++ b/sql/updates/0.14/7988_07_characters_characters.sql @@ -4,34 +4,34 @@ UPDATE characters SET data = REPLACE(data,' ',' '); UPDATE characters SET data = CONCAT(TRIM(data),' '); UPDATE `characters` SET `data` = CONCAT( - SUBSTRING_INDEX(`data`, ' ', 257 + 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 1), ' ', -261 + 260 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18 + 1), ' ', -261 - 18 + 260 + 18 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*2 + 1), ' ', -261 - 18*2 + 260 + 18*2 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*3 + 1), ' ', -261 - 18*3 + 260 + 18*3 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*4 + 1), ' ', -261 - 18*4 + 260 + 18*4 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*5 + 1), ' ', -261 - 18*5 + 260 + 18*5 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*6 + 1), ' ', -261 - 18*6 + 260 + 18*6 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*7 + 1), ' ', -261 - 18*7 + 260 + 18*7 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*8 + 1), ' ', -261 - 18*8 + 260 + 18*8 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*9 + 1), ' ', -261 - 18*9 + 260 + 18*9 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*10 + 1), ' ', -261 - 18*10 + 260 + 18*10 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*11 + 1), ' ', -261 - 18*11 + 260 + 18*11 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*12 + 1), ' ', -261 - 18*12 + 260 + 18*12 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*13 + 1), ' ', -261 - 18*13 + 260 + 18*13 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*14 + 1), ' ', -261 - 18*14 + 260 + 18*14 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*15 + 1), ' ', -261 - 18*15 + 260 + 18*15 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*16 + 1), ' ', -261 - 18*16 + 260 + 18*16 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*17 + 1), ' ', -261 - 18*17 + 260 + 18*17 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*18 + 1), ' ', -261 - 18*18 + 260 + 18*18 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 837 + 1), ' ', -837 + 600 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 937 + 1), ' ', -937 + 874 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1007 + 1), ' ', -1007 + 1002 - 1), ' ', - '0 0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1688 + 1), ' ', -1688 + 1008 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1696 + 1), ' ', -1696 + 1691 - 1), ' ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1700 + 1), ' ', -1700 + 1699 - 1), ' ' - ) + SUBSTRING_INDEX(`data`, ' ', 257 + 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 1), ' ', -261 + 260 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18 + 1), ' ', -261 - 18 + 260 + 18 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*2 + 1), ' ', -261 - 18*2 + 260 + 18*2 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*3 + 1), ' ', -261 - 18*3 + 260 + 18*3 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*4 + 1), ' ', -261 - 18*4 + 260 + 18*4 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*5 + 1), ' ', -261 - 18*5 + 260 + 18*5 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*6 + 1), ' ', -261 - 18*6 + 260 + 18*6 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*7 + 1), ' ', -261 - 18*7 + 260 + 18*7 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*8 + 1), ' ', -261 - 18*8 + 260 + 18*8 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*9 + 1), ' ', -261 - 18*9 + 260 + 18*9 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*10 + 1), ' ', -261 - 18*10 + 260 + 18*10 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*11 + 1), ' ', -261 - 18*11 + 260 + 18*11 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*12 + 1), ' ', -261 - 18*12 + 260 + 18*12 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*13 + 1), ' ', -261 - 18*13 + 260 + 18*13 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*14 + 1), ' ', -261 - 18*14 + 260 + 18*14 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*15 + 1), ' ', -261 - 18*15 + 260 + 18*15 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*16 + 1), ' ', -261 - 18*16 + 260 + 18*16 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*17 + 1), ' ', -261 - 18*17 + 260 + 18*17 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*18 + 1), ' ', -261 - 18*18 + 260 + 18*18 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 837 + 1), ' ', -837 + 600 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 937 + 1), ' ', -937 + 874 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1007 + 1), ' ', -1007 + 1002 - 1), ' ', + '0 0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1688 + 1), ' ', -1688 + 1008 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1696 + 1), ' ', -1696 + 1691 - 1), ' ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1700 + 1), ' ', -1700 + 1699 - 1), ' ' + ) WHERE length(SUBSTRING_INDEX(data, ' ', 1700)) < length(data) and length(SUBSTRING_INDEX(data, ' ', 1701)) >= length(data); UPDATE characters SET data = REPLACE(data,' ',' '); diff --git a/sql/updates/0.15/8589_11_characters_characters.sql b/sql/updates/0.15/8589_11_characters_characters.sql index 663f13518..2ab2a27b3 100644 --- a/sql/updates/0.15/8589_11_characters_characters.sql +++ b/sql/updates/0.15/8589_11_characters_characters.sql @@ -4,13 +4,13 @@ UPDATE characters SET data = REPLACE(data,' ',' '); UPDATE characters SET data = CONCAT(TRIM(data),' '); UPDATE `characters` SET `data` = CONCAT( - SUBSTRING_INDEX(`data`, ' ', 1167 + 1), ' ', - '0 0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1246 + 1), ' ', -1246 + 1168 - 1), ' ', - '0 0 0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1294 + 1), ' ', -1294 + 1247 - 1), ' ', - '0 ' - ) + SUBSTRING_INDEX(`data`, ' ', 1167 + 1), ' ', + '0 0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1246 + 1), ' ', -1246 + 1168 - 1), ' ', + '0 0 0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1294 + 1), ' ', -1294 + 1247 - 1), ' ', + '0 ' + ) WHERE length(SUBSTRING_INDEX(data, ' ', 1294)) < length(data) and length(SUBSTRING_INDEX(data, ' ', 1294+1)) >= length(data); UPDATE characters SET data = REPLACE(data,' ',' '); diff --git a/sql/updates/0.16/09136_07_characters_characters.sql b/sql/updates/0.16/09136_07_characters_characters.sql index f456e10ab..5c559281a 100644 --- a/sql/updates/0.16/09136_07_characters_characters.sql +++ b/sql/updates/0.16/09136_07_characters_characters.sql @@ -4,60 +4,60 @@ UPDATE characters SET data = REPLACE(data,' ',' '); UPDATE characters SET data = CONCAT(TRIM(data),' '); UPDATE `characters` SET `data` = CONCAT( - SUBSTRING_INDEX(`data`, ' ', 161 + 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 1), ' ', -165 + 162 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4 + 1), ' ', -165 - 4 + 162 + 4 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*2 + 1), ' ', -165 - 4*2 + 162 + 4*2 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*3 + 1), ' ', -165 - 4*3 + 162 + 4*3 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*4 + 1), ' ', -165 - 4*4 + 162 + 4*4 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*5 + 1), ' ', -165 - 4*5 + 162 + 4*5 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*6 + 1), ' ', -165 - 4*6 + 162 + 4*6 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*7 + 1), ' ', -165 - 4*7 + 162 + 4*7 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*8 + 1), ' ', -165 - 4*8 + 162 + 4*8 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*9 + 1), ' ', -165 - 4*9 + 162 + 4*9 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*10 + 1), ' ', -165 - 4*10 + 162 + 4*10 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*11 + 1), ' ', -165 - 4*11 + 162 + 4*11 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*12 + 1), ' ', -165 - 4*12 + 162 + 4*12 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*13 + 1), ' ', -165 - 4*13 + 162 + 4*13 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*14 + 1), ' ', -165 - 4*14 + 162 + 4*14 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*15 + 1), ' ', -165 - 4*15 + 162 + 4*15 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*16 + 1), ' ', -165 - 4*16 + 162 + 4*16 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*17 + 1), ' ', -165 - 4*17 + 162 + 4*17 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*18 + 1), ' ', -165 - 4*18 + 162 + 4*18 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*19 + 1), ' ', -165 - 4*19 + 162 + 4*19 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*20 + 1), ' ', -165 - 4*20 + 162 + 4*20 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*21 + 1), ' ', -165 - 4*21 + 162 + 4*21 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*22 + 1), ' ', -165 - 4*22 + 162 + 4*22 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*23 + 1), ' ', -165 - 4*23 + 162 + 4*23 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 298 + 1), ' ', -298 + 162 + 4*24 - 1), ' ', - '0 ', - SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1300 + 1), ' ', -1300 + 299 - 1), ' ' - ) + SUBSTRING_INDEX(`data`, ' ', 161 + 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 1), ' ', -165 + 162 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4 + 1), ' ', -165 - 4 + 162 + 4 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*2 + 1), ' ', -165 - 4*2 + 162 + 4*2 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*3 + 1), ' ', -165 - 4*3 + 162 + 4*3 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*4 + 1), ' ', -165 - 4*4 + 162 + 4*4 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*5 + 1), ' ', -165 - 4*5 + 162 + 4*5 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*6 + 1), ' ', -165 - 4*6 + 162 + 4*6 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*7 + 1), ' ', -165 - 4*7 + 162 + 4*7 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*8 + 1), ' ', -165 - 4*8 + 162 + 4*8 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*9 + 1), ' ', -165 - 4*9 + 162 + 4*9 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*10 + 1), ' ', -165 - 4*10 + 162 + 4*10 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*11 + 1), ' ', -165 - 4*11 + 162 + 4*11 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*12 + 1), ' ', -165 - 4*12 + 162 + 4*12 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*13 + 1), ' ', -165 - 4*13 + 162 + 4*13 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*14 + 1), ' ', -165 - 4*14 + 162 + 4*14 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*15 + 1), ' ', -165 - 4*15 + 162 + 4*15 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*16 + 1), ' ', -165 - 4*16 + 162 + 4*16 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*17 + 1), ' ', -165 - 4*17 + 162 + 4*17 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*18 + 1), ' ', -165 - 4*18 + 162 + 4*18 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*19 + 1), ' ', -165 - 4*19 + 162 + 4*19 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*20 + 1), ' ', -165 - 4*20 + 162 + 4*20 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*21 + 1), ' ', -165 - 4*21 + 162 + 4*21 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*22 + 1), ' ', -165 - 4*22 + 162 + 4*22 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 165 + 4*23 + 1), ' ', -165 - 4*23 + 162 + 4*23 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 298 + 1), ' ', -298 + 162 + 4*24 - 1), ' ', + '0 ', + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1300 + 1), ' ', -1300 + 299 - 1), ' ' + ) WHERE length(SUBSTRING_INDEX(data, ' ', 1300)) < length(data) and length(SUBSTRING_INDEX(data, ' ', 1300+1)) >= length(data); UPDATE characters SET data = REPLACE(data,' ',' '); diff --git a/sql/updates/0.5/1465_build_realmd_db.sql b/sql/updates/0.5/1465_build_realmd_db.sql index 1b52a8c6f..a65764cc0 100644 --- a/sql/updates/0.5/1465_build_realmd_db.sql +++ b/sql/updates/0.5/1465_build_realmd_db.sql @@ -2,7 +2,7 @@ -- -- Host: localhost Database: realmd -- ------------------------------------------------------ --- Server version 5.0.21 +-- Server version 5.0.21 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/sql/updates/0.7/3655_quest_template.sql b/sql/updates/0.7/3655_quest_template.sql index 8882fca15..f67bd5502 100644 --- a/sql/updates/0.7/3655_quest_template.sql +++ b/sql/updates/0.7/3655_quest_template.sql @@ -19,6 +19,6 @@ UPDATE `quest_template` SET `ZoneOrSort` = -304 WHERE `ZoneOrSort` = 0 AND `Req UPDATE `quest_template` SET `ZoneOrSort` = -324 WHERE `ZoneOrSort` = 0 AND `RequiredSkill` = 129; ALTER TABLE `quest_template` - ADD COLUMN `SuggestedPlayers` int(11) unsigned NOT NULL DEFAULT 0 AFTER `RequiredRepValue`, - DROP COLUMN `RequiredClass`, - DROP COLUMN `RequiredSkill`; + ADD COLUMN `SuggestedPlayers` int(11) unsigned NOT NULL DEFAULT 0 AFTER `RequiredRepValue`, + DROP COLUMN `RequiredClass`, + DROP COLUMN `RequiredSkill`; diff --git a/sql/updates/10156_01_characters_character_aura.sql b/sql/updates/10156_01_characters_character_aura.sql index f9f908735..94335c888 100644 --- a/sql/updates/10156_01_characters_character_aura.sql +++ b/sql/updates/10156_01_characters_character_aura.sql @@ -2,15 +2,15 @@ ALTER TABLE character_db_version CHANGE COLUMN required_10051_01_characters_char DELETE FROM `character_aura`; ALTER TABLE `character_aura` - DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`; + DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`; ALTER TABLE `character_aura` - ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `effIndexMask` INT(11) NOT NULL DEFAULT '0'; \ No newline at end of file + ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `effIndexMask` INT(11) NOT NULL DEFAULT '0'; \ No newline at end of file diff --git a/sql/updates/10156_02_characters_pet_aura.sql b/sql/updates/10156_02_characters_pet_aura.sql index 38f7472bd..18269bb9a 100644 --- a/sql/updates/10156_02_characters_pet_aura.sql +++ b/sql/updates/10156_02_characters_pet_aura.sql @@ -2,15 +2,15 @@ ALTER TABLE character_db_version CHANGE COLUMN required_10156_01_characters_char DELETE FROM `pet_aura`; ALTER TABLE `pet_aura` - DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`; + DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`; ALTER TABLE `pet_aura` - ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0', - ADD COLUMN `effIndexMask` INT(11) NOT NULL DEFAULT '0'; \ No newline at end of file + ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0', + ADD COLUMN `effIndexMask` INT(11) NOT NULL DEFAULT '0'; \ No newline at end of file diff --git a/sql/updates/10582_01_mangos_spell_proc_event.sql b/sql/updates/10582_01_mangos_spell_proc_event.sql index 2f70a0a33..9111b9c9f 100644 --- a/sql/updates/10582_01_mangos_spell_proc_event.sql +++ b/sql/updates/10582_01_mangos_spell_proc_event.sql @@ -2,10 +2,10 @@ ALTER TABLE db_version CHANGE COLUMN required_10551_01_mangos_spell_proc_event r DELETE FROM spell_proc_event WHERE entry IN (67356, 67363, 67365, 67379, 67381, 67384, 67386, 67389, 67392); INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName, - SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2, - SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2, - SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2, - procFlags, procEx, ppmRate, CustomChance, Cooldown) VALUES + SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2, + SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2, + SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2, + procFlags, procEx, ppmRate, CustomChance, Cooldown) VALUES (67356, 0x00, 7, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0.000000, 0.000000, 5), (67363, 0x00, 10, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 10), (67365, 0x00, 10, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 6), diff --git a/sql/updates/10604_01_mangos_spell_proc_event.sql b/sql/updates/10604_01_mangos_spell_proc_event.sql index 9ca5e7b32..450f50d76 100644 --- a/sql/updates/10604_01_mangos_spell_proc_event.sql +++ b/sql/updates/10604_01_mangos_spell_proc_event.sql @@ -4,10 +4,10 @@ DELETE FROM spell_proc_event WHERE entry IN (57907,62147,64952,64964,71174,71176,71178,71186,71191,71194,71198,71217,71226,71228); INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName, - SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2, - SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2, - SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2, - procFlags, procEx, ppmRate, CustomChance, Cooldown) VALUES + SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2, + SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2, + SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2, + procFlags, procEx, ppmRate, CustomChance, Cooldown) VALUES (57907, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.0, 0.0, 0), (62147, 0x00, 15, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.0, 0.0, 0), (64952, 0x00, 7, 0x00000000, 0x00000000, 0x00000000, 0x00000440, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.0, 0.0, 0), diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 966379989..62c576767 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -3413,7 +3413,7 @@ void ObjectMgr::LoadArenaTeams() // 0 1 2 3 4 5 QueryResult *result = CharacterDatabase.Query( "SELECT arena_team.arenateamid,name,captainguid,type,BackgroundColor,EmblemStyle," - // 6 7 8 9 10 11 12 13 14 + // 6 7 8 9 10 11 12 13 14 "EmblemColor,BorderStyle,BorderColor, rating,games_week,wins_week,games_season,wins_season,rank " "FROM arena_team LEFT JOIN arena_team_stats ON arena_team.arenateamid = arena_team_stats.arenateamid ORDER BY arena_team.arenateamid ASC" ); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8f2075c0a..9d41ef10f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11371" + #define REVISION_NR "11372" #endif // __REVISION_NR_H__