josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-10 14:58:28 -05:00
parent ff3332f066 6f87cf18b4
commit bcb2368faf
7 changed files with 30 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/TBC-WLK_converter/TBC-WLK_characters.sql
+6
View File
@@ -261,6 +261,12 @@ DELETE FROM `character_spell` WHERE `spell` IN (27354,24513,24512,24511,24494,21
UPDATE IGNORE character_spell SET spell = 2108 WHERE spell = 3104; UPDATE IGNORE character_spell SET spell = 2108 WHERE spell = 3104;
DELETE FROM character_spell WHERE spell = 3104; DELETE FROM character_spell WHERE spell = 3104;
/* Remove Mana Tap */
DELETE FROM `character_action` WHERE `type` = 0 AND `action` = 28734;
DELETE FROM `character_aura` WHERE `spell` = 28734;
DELETE FROM `character_spell` WHERE `spell` = 28734;
DELETE FROM `character_spell_cooldown` WHERE `spell` = 28734;
/* This cleanup character_action. This is like delete from character_action where type=0 and action not in character_spell for same player */ /* This cleanup character_action. This is like delete from character_action where type=0 and action not in character_spell for same player */
DELETE FROM ca,cs USING `character_action` ca LEFT JOIN `character_spell` cs ON ca.`guid`=cs.`guid` AND ca.`action`=cs.`spell` WHERE ca.`type`=0 AND cs.`guid` IS NULL; DELETE FROM ca,cs USING `character_action` ca LEFT JOIN `character_spell` cs ON ca.`guid`=cs.`guid` AND ca.`action`=cs.`spell` WHERE ca.`type`=0 AND cs.`guid` IS NULL;
sql/TBC-WLK_converter/TBC-WLK_world.sql
+6 -18
View File
@@ -314,29 +314,25 @@ INSERT IGNORE INTO `playercreateinfo_action` (`race`, `class`, `button`, `action
(10, 2, 0, 6603, 0, 0), (10, 2, 0, 6603, 0, 0),
(10, 2, 1, 21084, 0, 0), (10, 2, 1, 21084, 0, 0),
(10, 2, 2, 635, 0, 0), (10, 2, 2, 635, 0, 0),
(10, 2, 3, 28734, 0, 0), (10, 2, 3, 28730, 0, 0),
(10, 2, 4, 28730, 0, 0),
(10, 2, 10, 159, 128, 0), (10, 2, 10, 159, 128, 0),
(10, 2, 11, 20857, 128, 0), (10, 2, 11, 20857, 128, 0),
(10, 3, 0, 6603, 0, 0), (10, 3, 0, 6603, 0, 0),
(10, 3, 1, 2973, 0, 0), (10, 3, 1, 2973, 0, 0),
(10, 3, 2, 75, 0, 0), (10, 3, 2, 75, 0, 0),
(10, 3, 3, 28734, 0, 0), (10, 3, 3, 28730, 0, 0),
(10, 3, 4, 28730, 0, 0),
(10, 3, 10, 159, 128, 0), (10, 3, 10, 159, 128, 0),
(10, 3, 11, 20857, 128, 0), (10, 3, 11, 20857, 128, 0),
(10, 4, 0, 6603, 0, 0), (10, 4, 0, 6603, 0, 0),
(10, 4, 1, 1752, 0, 0), (10, 4, 1, 1752, 0, 0),
(10, 4, 2, 2098, 0, 0), (10, 4, 2, 2098, 0, 0),
(10, 4, 3, 2764, 0, 0), (10, 4, 3, 2764, 0, 0),
(10, 4, 4, 28734, 0, 0), (10, 4, 4, 25046, 0, 0),
(10, 4, 5, 25046, 0, 0),
(10, 4, 11, 20857, 128, 0), (10, 4, 11, 20857, 128, 0),
(10, 5, 0, 6603, 0, 0), (10, 5, 0, 6603, 0, 0),
(10, 5, 1, 585, 0, 0), (10, 5, 1, 585, 0, 0),
(10, 5, 2, 2050, 0, 0), (10, 5, 2, 2050, 0, 0),
(10, 5, 3, 28734, 0, 0), (10, 5, 3, 28730, 0, 0),
(10, 5, 4, 28730, 0, 0),
(10, 5, 10, 159, 128, 0), (10, 5, 10, 159, 128, 0),
(10, 5, 11, 20857, 128, 0), (10, 5, 11, 20857, 128, 0),
(10, 6, 0, 6603, 0, 0), (10, 6, 0, 6603, 0, 0),
@@ -349,14 +345,12 @@ INSERT IGNORE INTO `playercreateinfo_action` (`race`, `class`, `button`, `action
(10, 8, 0, 6603, 0, 0), (10, 8, 0, 6603, 0, 0),
(10, 8, 1, 133, 0, 0), (10, 8, 1, 133, 0, 0),
(10, 8, 2, 168, 0, 0), (10, 8, 2, 168, 0, 0),
(10, 8, 3, 28734, 0, 0), (10, 8, 3, 28730, 0, 0),
(10, 8, 4, 28730, 0, 0),
(10, 8, 10, 159, 128, 0), (10, 8, 10, 159, 128, 0),
(10, 8, 11, 20857, 128, 0), (10, 8, 11, 20857, 128, 0),
(10, 9, 11, 20857, 128, 0), (10, 9, 11, 20857, 128, 0),
(10, 9, 10, 159, 128, 0), (10, 9, 10, 159, 128, 0),
(10, 9, 4, 28730, 0, 0), (10, 9, 3, 28730, 0, 0),
(10, 9, 3, 28734, 0, 0),
(10, 9, 2, 687, 0, 0), (10, 9, 2, 687, 0, 0),
(10, 9, 1, 686, 0, 0), (10, 9, 1, 686, 0, 0),
(10, 9, 0, 6603, 0, 0), (10, 9, 0, 6603, 0, 0),
@@ -2647,7 +2641,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
(10, 2, 22810, 'Opening - No Text'), (10, 2, 22810, 'Opening - No Text'),
(10, 2, 27762, 'Libram'), (10, 2, 27762, 'Libram'),
(10, 2, 28730, 'Arcane Torrent'), (10, 2, 28730, 'Arcane Torrent'),
(10, 2, 28734, 'Mana Tap'),
(10, 2, 28877, 'Arcane Affinity'), (10, 2, 28877, 'Arcane Affinity'),
(10, 3, 75, 'Auto Shot'), (10, 3, 75, 'Auto Shot'),
(10, 3, 81, 'Dodge'), (10, 3, 81, 'Dodge'),
@@ -2684,7 +2677,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
(10, 3, 22810, 'Opening - No Text'), (10, 3, 22810, 'Opening - No Text'),
(10, 3, 24949, 'Defensive State 2 (DND)'), (10, 3, 24949, 'Defensive State 2 (DND)'),
(10, 3, 28730, 'Arcane Torrent'), (10, 3, 28730, 'Arcane Torrent'),
(10, 3, 28734, 'Mana Tap'),
(10, 3, 28877, 'Arcane Affinity'), (10, 3, 28877, 'Arcane Affinity'),
(10, 3, 34082, 'Advantaged State (DND)'), (10, 3, 34082, 'Advantaged State (DND)'),
(10, 4, 81, 'Dodge'), (10, 4, 81, 'Dodge'),
@@ -2723,7 +2715,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
(10, 4, 22027, 'Remove Insignia'), (10, 4, 22027, 'Remove Insignia'),
(10, 4, 22810, 'Opening - No Text'), (10, 4, 22810, 'Opening - No Text'),
(10, 4, 25046, 'Arcane Torrent'), (10, 4, 25046, 'Arcane Torrent'),
(10, 4, 28734, 'Mana Tap'),
(10, 4, 28877, 'Arcane Affinity'), (10, 4, 28877, 'Arcane Affinity'),
(10, 5, 81, 'Dodge'), (10, 5, 81, 'Dodge'),
(10, 5, 198, 'One-Handed Maces'), (10, 5, 198, 'One-Handed Maces'),
@@ -2758,7 +2749,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
(10, 5, 22027, 'Remove Insignia'), (10, 5, 22027, 'Remove Insignia'),
(10, 5, 22810, 'Opening - No Text'), (10, 5, 22810, 'Opening - No Text'),
(10, 5, 28730, 'Arcane Torrent'), (10, 5, 28730, 'Arcane Torrent'),
(10, 5, 28734, 'Mana Tap'),
(10, 5, 28877, 'Arcane Affinity'), (10, 5, 28877, 'Arcane Affinity'),
(10, 6, 81, 'Dodge'), (10, 6, 81, 'Dodge'),
(10, 6, 196, 'One-Handed Axes'), (10, 6, 196, 'One-Handed Axes'),
@@ -2860,7 +2850,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
(10, 8, 22027, 'Remove Insignia'), (10, 8, 22027, 'Remove Insignia'),
(10, 8, 22810, 'Opening - No Text'), (10, 8, 22810, 'Opening - No Text'),
(10, 8, 28730, 'Arcane Torrent'), (10, 8, 28730, 'Arcane Torrent'),
(10, 8, 28734, 'Mana Tap'),
(10, 8, 28877, 'Arcane Affinity'), (10, 8, 28877, 'Arcane Affinity'),
(10, 9, 81, 'Dodge'), (10, 9, 81, 'Dodge'),
(10, 9, 203, 'Unarmed'), (10, 9, 203, 'Unarmed'),
@@ -2895,7 +2884,6 @@ INSERT IGNORE INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) V
(10, 9, 22027, 'Remove Insignia'), (10, 9, 22027, 'Remove Insignia'),
(10, 9, 22810, 'Opening - No Text'), (10, 9, 22810, 'Opening - No Text'),
(10, 9, 28730, 'Arcane Torrent'), (10, 9, 28730, 'Arcane Torrent'),
(10, 9, 28734, 'Mana Tap'),
(10, 9, 28877, 'Arcane Affinity'), (10, 9, 28877, 'Arcane Affinity'),
(10, 9, 58284, 'Chaos Bolt Passive'), (10, 9, 58284, 'Chaos Bolt Passive'),
(11, 1, 78, 'Heroic Strike'), (11, 1, 78, 'Heroic Strike'),
sql/updates/3235_characters.sql
+4
View File
@@ -0,0 +1,4 @@
DELETE FROM `character_action` WHERE `type` = 0 AND `action` = 28734;
DELETE FROM `character_aura` WHERE `spell` = 28734;
DELETE FROM `character_spell` WHERE `spell` = 28734;
DELETE FROM `character_spell_cooldown` WHERE `spell` = 28734;
sql/updates/3235_world.sql
+6
View File
@@ -0,0 +1,6 @@
DELETE FROM `playercreateinfo_action` WHERE `type` = 0 AND `action` = 28734;
DELETE FROM `playercreateinfo_spell` WHERE `spell` = 28734;
DELETE FROM `playercreateinfo_spell_custom` WHERE `spell` = 28734;
UPDATE `playercreateinfo_action` SET `button` = 3 WHERE `race` = 10 AND `class` IN (2, 3, 5, 8, 9) AND `action` = 28730 AND `type` = 0;
UPDATE `playercreateinfo_action` SET `button` = 4 WHERE `race` = 10 AND `class` = 4 AND `action` = 25046 AND `type` = 0;
sql/world.sql
+6 -18
View File
@@ -9886,29 +9886,25 @@ INSERT INTO `playercreateinfo_action` VALUES
(10,2,0,6603,0,0), (10,2,0,6603,0,0),
(10,2,1,21084,0,0), (10,2,1,21084,0,0),
(10,2,2,635,0,0), (10,2,2,635,0,0),
(10,2,3,28734,0,0), (10,2,3,28730,0,0),
(10,2,4,28730,0,0),
(10,2,10,159,128,0), (10,2,10,159,128,0),
(10,2,11,20857,128,0), (10,2,11,20857,128,0),
(10,3,0,6603,0,0), (10,3,0,6603,0,0),
(10,3,1,2973,0,0), (10,3,1,2973,0,0),
(10,3,2,75,0,0), (10,3,2,75,0,0),
(10,3,3,28734,0,0), (10,3,3,28730,0,0),
(10,3,4,28730,0,0),
(10,3,10,159,128,0), (10,3,10,159,128,0),
(10,3,11,20857,128,0), (10,3,11,20857,128,0),
(10,4,0,6603,0,0), (10,4,0,6603,0,0),
(10,4,1,1752,0,0), (10,4,1,1752,0,0),
(10,4,2,2098,0,0), (10,4,2,2098,0,0),
(10,4,3,2764,0,0), (10,4,3,2764,0,0),
(10,4,4,28734,0,0), (10,4,4,25046,0,0),
(10,4,5,25046,0,0),
(10,4,11,20857,128,0), (10,4,11,20857,128,0),
(10,5,0,6603,0,0), (10,5,0,6603,0,0),
(10,5,1,585,0,0), (10,5,1,585,0,0),
(10,5,2,2050,0,0), (10,5,2,2050,0,0),
(10,5,3,28734,0,0), (10,5,3,28730,0,0),
(10,5,4,28730,0,0),
(10,5,10,159,128,0), (10,5,10,159,128,0),
(10,5,11,20857,128,0), (10,5,11,20857,128,0),
(10,6,0,6603,0,0), (10,6,0,6603,0,0),
@@ -9921,14 +9917,12 @@ INSERT INTO `playercreateinfo_action` VALUES
(10,8,0,6603,0,0), (10,8,0,6603,0,0),
(10,8,1,133,0,0), (10,8,1,133,0,0),
(10,8,2,168,0,0), (10,8,2,168,0,0),
(10,8,3,28734,0,0), (10,8,3,28730,0,0),
(10,8,4,28730,0,0),
(10,8,10,159,128,0), (10,8,10,159,128,0),
(10,8,11,20857,128,0), (10,8,11,20857,128,0),
(10,9,11,20857,128,0), (10,9,11,20857,128,0),
(10,9,10,159,128,0), (10,9,10,159,128,0),
(10,9,4,28730,0,0), (10,9,3,28730,0,0),
(10,9,3,28734,0,0),
(10,9,2,687,0,0), (10,9,2,687,0,0),
(10,9,1,686,0,0), (10,9,1,686,0,0),
(10,9,0,6603,0,0), (10,9,0,6603,0,0),
@@ -12170,7 +12164,6 @@ INSERT INTO `playercreateinfo_spell` VALUES
(10,2,22810,'Opening - No Text',1), (10,2,22810,'Opening - No Text',1),
(10,2,27762,'Libram',1), (10,2,27762,'Libram',1),
(10,2,28730,'Arcane Torrent',1), (10,2,28730,'Arcane Torrent',1),
(10,2,28734,'Mana Tap',1),
(10,2,28877,'Arcane Affinity',1), (10,2,28877,'Arcane Affinity',1),
(10,3,75,'Auto Shot',1), (10,3,75,'Auto Shot',1),
(10,3,81,'Dodge',1), (10,3,81,'Dodge',1),
@@ -12207,7 +12200,6 @@ INSERT INTO `playercreateinfo_spell` VALUES
(10,3,22810,'Opening - No Text',1), (10,3,22810,'Opening - No Text',1),
(10,3,24949,'Defensive State 2(DND)',1), (10,3,24949,'Defensive State 2(DND)',1),
(10,3,28730,'Arcane Torrent',1), (10,3,28730,'Arcane Torrent',1),
(10,3,28734,'Mana Tap',1),
(10,3,28877,'Arcane Affinity',1), (10,3,28877,'Arcane Affinity',1),
(10,3,34082,'Advantaged State(DND)',1), (10,3,34082,'Advantaged State(DND)',1),
(10,4,81,'Dodge',1), (10,4,81,'Dodge',1),
@@ -12246,7 +12238,6 @@ INSERT INTO `playercreateinfo_spell` VALUES
(10,4,22027,'Remove Insignia',1), (10,4,22027,'Remove Insignia',1),
(10,4,22810,'Opening - No Text',1), (10,4,22810,'Opening - No Text',1),
(10,4,25046,'Arcane Torrent',1), (10,4,25046,'Arcane Torrent',1),
(10,4,28734,'Mana Tap',1),
(10,4,28877,'Arcane Affinity',1), (10,4,28877,'Arcane Affinity',1),
(10,5,81,'Dodge',1), (10,5,81,'Dodge',1),
(10,5,198,'One-Handed Maces',1), (10,5,198,'One-Handed Maces',1),
@@ -12281,7 +12272,6 @@ INSERT INTO `playercreateinfo_spell` VALUES
(10,5,22027,'Remove Insignia',1), (10,5,22027,'Remove Insignia',1),
(10,5,22810,'Opening - No Text',1), (10,5,22810,'Opening - No Text',1),
(10,5,28730,'Arcane Torrent',1), (10,5,28730,'Arcane Torrent',1),
(10,5,28734,'Mana Tap',1),
(10,5,28877,'Arcane Affinity',1), (10,5,28877,'Arcane Affinity',1),
(10,6,81,'Dodge',1), (10,6,81,'Dodge',1),
(10,6,196,'One-Handed Axes',1), (10,6,196,'One-Handed Axes',1),
@@ -12383,7 +12373,6 @@ INSERT INTO `playercreateinfo_spell` VALUES
(10,8,22027,'Remove Insignia',1), (10,8,22027,'Remove Insignia',1),
(10,8,22810,'Opening - No Text',1), (10,8,22810,'Opening - No Text',1),
(10,8,28730,'Arcane Torrent',1), (10,8,28730,'Arcane Torrent',1),
(10,8,28734,'Mana Tap',1),
(10,8,28877,'Arcane Affinity',1), (10,8,28877,'Arcane Affinity',1),
(10,9,81,'Dodge',1), (10,9,81,'Dodge',1),
(10,9,203,'Unarmed',1), (10,9,203,'Unarmed',1),
@@ -12418,7 +12407,6 @@ INSERT INTO `playercreateinfo_spell` VALUES
(10,9,22027,'Remove Insignia',1), (10,9,22027,'Remove Insignia',1),
(10,9,22810,'Opening - No Text',1), (10,9,22810,'Opening - No Text',1),
(10,9,28730,'Arcane Torrent',1), (10,9,28730,'Arcane Torrent',1),
(10,9,28734,'Mana Tap',1),
(10,9,28877,'Arcane Affinity',1), (10,9,28877,'Arcane Affinity',1),
(11,1,78,'Heroic Strike',1), (11,1,78,'Heroic Strike',1),
(11,1,81,'Dodge',1), (11,1,81,'Dodge',1),
src/game/SpellAuras.cpp
+2 -16
View File
@@ -3861,25 +3861,11 @@ void AuraEffect::HandleAuraModSilence(bool apply, bool Real)
if (m_target->m_currentSpells[i] && m_target->m_currentSpells[i]->m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE) if (m_target->m_currentSpells[i] && m_target->m_currentSpells[i]->m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE)
m_target->InterruptSpell(i,false); // Stop spells on prepare or casting state m_target->InterruptSpell(i,false); // Stop spells on prepare or casting state
/*
switch (GetId()) switch (GetId())
{ {
// Arcane Torrent (Energy)
case 25046:
{
Unit * caster = GetCaster();
if (!caster)
return;
// Search Mana Tap auras on caster
AuraEffect * dummy = caster->GetDummyAura(28734);
if (dummy)
{
int32 bp = dummy->GetParentAura()->GetStackAmount() * 10;
caster->CastCustomSpell(caster, 25048, &bp, NULL, NULL, true);
m_target->RemoveAurasDueToSpell(28734);
}
}
} }
*/
} }
else else
{ {
src/game/SpellEffects.cpp
-11
View File
@@ -1011,17 +1011,6 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastSpell(unitTarget,29294,true); m_caster->CastSpell(unitTarget,29294,true);
return; return;
} }
case 28730: // Arcane Torrent (Mana)
{
Aura * dummy = m_caster->GetAura(28734, m_caster->GetGUID());
if (dummy)
{
int32 bp = damage * dummy->GetStackAmount();
m_caster->CastCustomSpell(m_caster, 28733, &bp, NULL, NULL, true);
m_caster->RemoveAurasDueToSpell(28734);
}
return;
}
case 29200: // Purify Helboar Meat case 29200: // Purify Helboar Meat
{ {
if( m_caster->GetTypeId() != TYPEID_PLAYER ) if( m_caster->GetTypeId() != TYPEID_PLAYER )