mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/master' into 330

Browse source
This commit is contained in:
tomrus88 2009-12-18 00:11:59 +03:00
commit 58892c5025
7 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql/mangos.sql
View file

@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
`version` varchar(120) default NULL, `version` varchar(120) default NULL,
`creature_ai_version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL,
`cache_id` int(10) default '0', `cache_id` int(10) default '0',
`required_9007_01_mangos_spell_proc_event` bit(1) default NULL `required_9015_01_mangos_spell_bonus_data` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
-- --
@ -14129,6 +14129,7 @@ INSERT INTO `spell_bonus_data` VALUES
(34433, 0.65, 0, 0, 'Priest - Shadowfiend'), (34433, 0.65, 0, 0, 'Priest - Shadowfiend'),
(585, 0.714, 0, 0, 'Priest - Smite'), (585, 0.714, 0, 0, 'Priest - Smite'),
(34914, 0, 0.4, 0, 'Priest - Vampiric Touch'), (34914, 0, 0.4, 0, 'Priest - Vampiric Touch'),
(64085, 0, 0, 0, 'Priest - Vampiric Touch Dispel'),
/* Shaman */ /* Shaman */
(974, 0.4762, 0, 0, 'Shaman - Earth Shield'), (974, 0.4762, 0, 0, 'Shaman - Earth Shield'),
(379, 0, 0, 0, 'Shaman - Earth Shield Triggered'), (379, 0, 0, 0, 'Shaman - Earth Shield Triggered'),

5
sql/updates/9015_01_mangos_spell_bonus_data.sql Normal file
View file

@ -0,0 +1,5 @@
ALTER TABLE db_version CHANGE COLUMN required_9007_01_mangos_spell_proc_event required_9015_01_mangos_spell_bonus_data bit;
DELETE FROM spell_bonus_data WHERE entry = 64085;
INSERT INTO spell_bonus_data (entry, direct_bonus, dot_bonus, ap_bonus, comments) VALUES
(64085, 0, 0, 0, 'Priest - Vampiric Touch Dispel');

2
sql/updates/Makefile.am
View file

@ -212,6 +212,7 @@ pkgdata_DATA = \
9005_01_mangos_spell_proc_event.sql \ 9005_01_mangos_spell_proc_event.sql \
9007_01_mangos_spell_proc_event.sql \ 9007_01_mangos_spell_proc_event.sql \
9010_01_realmd_realmlist.sql \ 9010_01_realmd_realmlist.sql \
9015_01_mangos_spell_bonus_data.sql \
README README
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
@ -404,4 +405,5 @@ EXTRA_DIST = \
9005_01_mangos_spell_proc_event.sql \ 9005_01_mangos_spell_proc_event.sql \
9007_01_mangos_spell_proc_event.sql \ 9007_01_mangos_spell_proc_event.sql \
9010_01_realmd_realmlist.sql \ 9010_01_realmd_realmlist.sql \
9015_01_mangos_spell_bonus_data.sql \
README README

1
src/game/ObjectMgr.cpp
View file

@ -8347,6 +8347,7 @@ void ObjectMgr::LoadDbScriptStrings()
CheckScripts(sSpellScripts,ids); CheckScripts(sSpellScripts,ids);
CheckScripts(sGameObjectScripts,ids); CheckScripts(sGameObjectScripts,ids);
CheckScripts(sEventScripts,ids); CheckScripts(sEventScripts,ids);
CheckScripts(sGossipScripts,ids);
sWaypointMgr.CheckTextsExistance(ids); sWaypointMgr.CheckTextsExistance(ids);

2
src/game/SpellEffects.cpp
View file

@ -475,7 +475,7 @@ void Spell::EffectSchoolDMG(uint32 effect_idx)
// found Immolate or Shadowflame // found Immolate or Shadowflame
if (aura) if (aura)
{ {
int32 damagetick = m_caster->SpellDamageBonus(unitTarget, aura->GetSpellProto(), aura->GetModifier()->m_amount, DOT); int32 damagetick = aura->GetModifier()->m_amount;
damage += damagetick * 4; damage += damagetick * 4;
// Glyph of Conflagrate // Glyph of Conflagrate

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9013" #define REVISION_NR "9015"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__

2
src/shared/revision_sql.h
View file

@ -1,6 +1,6 @@
#ifndef __REVISION_SQL_H__ #ifndef __REVISION_SQL_H__
#define __REVISION_SQL_H__ #define __REVISION_SQL_H__
#define REVISION_DB_CHARACTERS "required_8874_01_characters_character_skills" #define REVISION_DB_CHARACTERS "required_8874_01_characters_character_skills"
#define REVISION_DB_MANGOS "required_9007_01_mangos_spell_proc_event" #define REVISION_DB_MANGOS "required_9015_01_mangos_spell_bonus_data"
#define REVISION_DB_REALMD "required_9010_01_realmd_realmlist" #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
#endif // __REVISION_SQL_H__ #endif // __REVISION_SQL_H__