aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/base/world_database.sql20
-rw-r--r--sql/updates/9123_world_spell_proc_event.sql5
-rw-r--r--src/server/shared/DataStores/DBCStore.h7
3 files changed, 23 insertions, 9 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index e1cba235b08..a98e8bfde83 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -6975,10 +6975,11 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
( 48988, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Bloody Vengeance (Rank 1)
( 49018, 0x00, 15, 0x01400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Sudden Doom (Rank 1)
( 49194, 0x00, 15, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Unholy Blight
-( 49027, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 3, 20), -- Bloodworms rank 1
-( 49542, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 6, 20), -- Bloodworms rank 2
-( 49543, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 9, 20), -- Bloodworms rank 3
+( 49027, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 3, 20), -- Bloodworms (Rank 1)
+( 49542, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 6, 20), -- Bloodworms (Rank 2)
+( 49543, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 9, 20), -- Bloodworms (Rank 3)
( 49208, 0x00, 15, 0x00400000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Reaping (Rank 1)
+( 49219, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 0, 0), -- Blood-Caked Blade (Rank 1)
( 49222, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 3), -- Bone Shield
( 49280, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 3), -- Lightning Shield (Rank 10)
( 49281, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 3), -- Lightning Shield (Rank 11)
@@ -6989,6 +6990,8 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
( 49529, 0x00, 15, 0x01400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Sudden Doom (Rank 2)
( 49530, 0x00, 15, 0x01400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Sudden Doom (Rank 3)
( 49622, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 60), -- Bonus Mana Regen
+( 49627, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 0, 0), -- Blood-Caked Blade (Rank 2)
+( 49628, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 0, 0), -- Blood-Caked Blade (Rank 3)
( 50781, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 6), -- Fate Rune of Primal Energy
( 50880, 0x00, 15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Icy Talons
( 50884, 0x00, 15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Icy Talons
@@ -7005,6 +7008,11 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
( 51352, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 10), -- Venture Company Beatdown!
( 51359, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 10), -- Venture Company Beatdown
( 51414, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Venomous Breath Aura
+( 51459, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 0, 0), -- Necrosis (Rank 1)
+( 51462, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 0, 0), -- Necrosis (Rank 2)
+( 51463, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 0, 0), -- Necrosis (Rank 3)
+( 51464, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 0, 0), -- Necrosis (Rank 4)
+( 51465, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 0, 0), -- Necrosis (Rank 5)
( 51474, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0, 0, 0), -- Astral Shift (Rank 1)
( 51478, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0, 0, 0), -- Astral Shift (Rank 2)
( 51479, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0, 0, 0), -- Astral Shift (Rank 3)
@@ -7313,9 +7321,9 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
( 49654, 0x00, 15, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0, 0, 1), -- Wandering Plague
( 49655, 0x00, 15, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0, 0, 1), -- Wandering Plague
( 58620, 0x00, 15, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Glyph of Chains of Ice
-( 56342, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 0), -- Lock and Load
-( 56343, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 0), -- Lock and Load
-( 56344, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 0), -- Lock and Load
+( 56342, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22), -- Lock and Load
+( 56343, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22), -- Lock and Load
+( 56344, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22), -- Lock and Load
( 48539, 0x00, 7, 0x00000010, 0x04000000, 0x00000000, 0x00040000, 0x00000000, 0, 0, 0), -- Revitalize
( 48544, 0x00, 7, 0x00000010, 0x04000000, 0x00000000, 0x00040000, 0x00000000, 0, 0, 0), -- Revitalize
( 48545, 0x00, 7, 0x00000010, 0x04000000, 0x00000000, 0x00040000, 0x00000000, 0, 0, 0), -- Revitalize
diff --git a/sql/updates/9123_world_spell_proc_event.sql b/sql/updates/9123_world_spell_proc_event.sql
new file mode 100644
index 00000000000..11275653e67
--- /dev/null
+++ b/sql/updates/9123_world_spell_proc_event.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (56342,56343,56344);
+INSERT INTO `spell_proc_event`(`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+( 56342, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22), -- Lock and Load
+( 56343, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22), -- Lock and Load
+( 56344, 0x00, 9, 0x00000018, 0x08000000, 0x00024000, 0x00000000, 0x00000000, 0, 0, 22); -- Lock and Load \ No newline at end of file
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index cd1d1881d68..a1a8413b6d6 100644
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -85,13 +85,14 @@ class DBCStorage
Field *fields = NULL;
QueryResult_AutoPtr result = QueryResult_AutoPtr(NULL);
// Load data from sql
- if (sql)
+ if (false/*sql*/)
{
std::string query = "SELECT * FROM " + sql->sqlTableName;
if (sql->indexPos >= 0)
- query +=" ORDER BY + " + *sql->indexName + " DESC";
+ query +=" ORDER BY " + *sql->indexName + " DESC";
query += ";";
+ /*
result = WorldDatabase.Query(query.c_str());
if (result)
{
@@ -107,7 +108,7 @@ class DBCStorage
sLog.outError("Invalid index pos for dbc:'%s'", sql->sqlTableName.c_str());
return false;
}
- }
+ }*/
}
char * sqlDataTable;
fieldCount = dbc.GetCols();