Skip to content

Commit

Permalink
[11200] Move hard-coded AP coefficients for spells 1776, 8680, 13218 …
Browse files Browse the repository at this point in the history 
…and ranks to spell_bonus_data table.
  • Loading branch information
@Lynx3d
Lynx3d committed Feb 23, 2011
1 parent a045f88 commit 2f3da34
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 21 deletions.
5 changes: 4 additions & 1 deletion sql/mangos.sql
View file
Expand Up @@ -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';

--
Expand Down Expand Up @@ -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'),
Expand Down
3 changes: 0 additions & 3 deletions sql/mangos_spell_check.sql
View file
Expand Up @@ -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'),
Expand All @@ -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'),
Expand Down Expand Up @@ -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');

This comment has been minimized.

Sign in to view

Copy link
@DasBlub

DasBlub Feb 24, 2011

Contributor

fixed the missing ';' here: 4bd343f
/*id fm familyMaskA fmMaskB icon vis cat eff aur ef name code */
7 changes: 7 additions & 0 deletions sql/updates/11200_01_mangos_spell_bonus_data.sql
View file
@@ -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');
15 changes: 0 additions & 15 deletions src/game/SpellEffects.cpp
View file
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
View file
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11199"
#define REVISION_NR "11200"
#endif // __REVISION_NR_H__
2 changes: 1 addition & 1 deletion src/shared/revision_sql.h
View file
@@ -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__

1 comment on commit 2f3da34

@VladimirMangos
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not typo but git_id tool go crazy after my wrong sql updates named in [11190]. It fixed now in [11201] and in next slq updates will work correctly.
At least until my next use wrong sql update names in commit ;)

In any case thank you for pointing :)

Please sign in to comment.