diff --git a/sql/mangos.sql b/sql/mangos.sql index 145788a7681..7519ea4bc9a 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_11190_01_mangos_pool_gameobject_template` bit(1) default NULL + `required_11200_01_mangos_spell_bonus_data` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -14603,6 +14603,9 @@ INSERT INTO `spell_bonus_data` VALUES /* Rogue */ (2818, 0, 0, 0, 0.03, 'Rogue - Deadly Poison'), (703, 0, 0, 0, 0.07, 'Rogue - Garrote'), +(1776, 0, 0, 0.21, 0, 'Rogue - Gouge'), +(8680, 0, 0, 0.10, 0, 'Rogue - Instant Poison'), +(13218, 0, 0, 0.04, 0, 'Rogue - Wound Poison'), /* Shaman */ (974, 0.4762, 0, 0, 0, 'Shaman - Earth Shield'), (379, 0, 0, 0, 0, 'Shaman - Earth Shield Triggered'), diff --git a/sql/mangos_spell_check.sql b/sql/mangos_spell_check.sql index f9022f7c56b..20150564673 100644 --- a/sql/mangos_spell_check.sql +++ b/sql/mangos_spell_check.sql @@ -653,7 +653,6 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas ( 0, 5, -1, -1, 16, -1, -1, -1, -1,-1,'Fire Shield', 'Spell::CheckCast'), ( 0,11,0x0000000000200000,0x00000000, -1, -1, -1, -1, -1,-1,'Flametongue', 'Spell::EffectDummy'), ( 0, 9, -1, -1,1578, -1, -1, 2, -1,-1,'Gore', 'Spell::EffectSchoolDMG'), -( 0, 8,0x0000000000000008,0x00000000, -1, -1, -1, 2, -1,-1,'Gouge', 'Spell::EffectSchoolDMG'), ( 0,10,0x0000008000000000,0x00000000, -1, -1, -1, 2, -1,-1,'Hammer of Wrath', 'Spell::EffectSchoolDMG'), ( 0,-1, -1, -1, -1,7250, -1, 2, -1,-1,'Hammer of Wrath', 'Spell::CheckCast'), ( 0,10,0x0004000000000000,0x00000000, -1, -1, -1, 2, -1,-1,'Hammer of the Righteous', 'Spell::EffectSchoolDMG'), @@ -674,7 +673,6 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas ( 0, 5, -1, -1, 208, -1, -1, -1, 4,-1,'Improved Life Tap', 'Spell::EffectDummy'), ( 0, 6, -1, -1, 95, -1, -1, -1,107,-1,'Improved Mind Blast', 'Spell::EffectSchoolDMG'), ( 0, 5,0x0000004000000000,0x00000000,2128, -1, -1, 2, -1,-1,'Incinerate', 'Spell::EffectSchoolDMG'), -( 0, 8,0x0000000000002000,0x00000000, -1, -1, -1, 2, -1,-1,'Instant Poison', 'Spell::EffectSchoolDMG'), ( 0,10, -1, -1, 561, -1, -1, 3, -1,-1,'Judgement of command', 'Spell::EffectDummy'), ( 0,10,0x0000000800000000,0x00000000,2292, -1, -1, 2, -1,-1,'Judgement of Vengeance', 'Spell::EffectSchoolDMG'), ( 0,10,0x0001000900B80400,0x00000000, -1, -1, -1, -1, -1,-1,'Judgements (all) / Holy Shock', 'Spell::prepareDataForTriggerSystem'), @@ -734,5 +732,4 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas ( 0,11,0x0000000004000000,0x00000000, -1, -1, -1, -1, -1,-1,'Totem of Wrath', 'Spell::cast'), ( 0, 4,0x0000010000000000,0x00000000, -1, -1, -1, 2, -1,-1,'Victory Rush', 'Spell::EffectSchoolDMG'), ( 0, 7, -1, -1,2864, -1, -1, 0, -1, 2,'Wild Growth', 'Spell::SetTargetMap'), -( 0, 8,0x0000000010000000,0x00000000, -1, -1, -1, 2, -1,-1,'Wound Poison', 'Spell::EffectSchoolDMG'); /*id fm familyMaskA fmMaskB icon vis cat eff aur ef name code */ diff --git a/sql/updates/11200_01_mangos_spell_bonus_data.sql b/sql/updates/11200_01_mangos_spell_bonus_data.sql new file mode 100644 index 00000000000..9bf62c4ca9d --- /dev/null +++ b/sql/updates/11200_01_mangos_spell_bonus_data.sql @@ -0,0 +1,7 @@ +ALTER TABLE db_version CHANGE COLUMN required_11190_01_mangos_pool_creature_template required_11200_01_mangos_spell_bonus_data bit; + +DELETE FROM spell_bonus_data WHERE entry IN (1776, 8680, 13218); +INSERT INTO spell_bonus_data VALUES +(1776, 0, 0, 0.21, 0, 'Rogue - Gouge'), +(8680, 0, 0, 0.10, 0, 'Rogue - Instant Poison'), +(13218, 0, 0, 0.04, 0, 'Rogue - Wound Poison'); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 19879614495..04825950d75 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -650,21 +650,6 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx) damage += combo*40; } } - // Gouge - else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000008)) - { - damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.21f); - } - // Instant Poison - else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000002000)) - { - damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.10f); - } - // Wound Poison - else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000010000000)) - { - damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.04f); - } break; } case SPELLFAMILY_HUNTER: diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 6d39b011f35..68702514297 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 "11199" + #define REVISION_NR "11200" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 826b0adbe4c..afdc94bc593 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_11117_02_characters_world" - #define REVISION_DB_MANGOS "required_11190_01_mangos_pool_gameobject_template" + #define REVISION_DB_MANGOS "required_11200_01_mangos_spell_bonus_data" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__