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

[9464] Spell effects of itemset 883 and variants.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
laise 2010-02-27 06:38:19 +03:00 • committed by VladimirMangos
parent fc08496048
commit 6efb768daa
6 changed files with 51 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
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_9460_02_mangos_spell_chain` bit(1) default NULL `required_9464_01_mangos_spell_proc_event` 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';
-- --
@ -18679,7 +18679,8 @@ INSERT INTO `spell_proc_event` VALUES
(67672, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 50), (67672, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 50),
(67702, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45), (67702, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
(67771, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45), (67771, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
(70664, 0x00000000, 7, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000, 2.000000, 0); (70664, 0x00000000, 7, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000, 2.000000, 0),
(70748, 0x00000000, 3, 0x00000000, 0x00200000, 0x00000000, 0x00000000, 0x00000000, 0x000000, 0.000000, 0);
/*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */; /*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;

6
sql/updates/9464_01_mangos_spell_proc_event.sql Normal file
View file

@ -0,0 +1,6 @@
ALTER TABLE db_version CHANGE COLUMN required_9460_02_mangos_spell_chain required_9464_01_mangos_spell_proc_event bit;
/*Item - Mage T10 4P Bonus*/
DELETE FROM `spell_proc_event` WHERE `entry` = 70748;
INSERT INTO `spell_proc_event` VALUES
(70748, 0x00000000, 3, 0x00000000, 0x00200000, 0x00000000, 0x00000000, 0x00000000, 0x000000, 0.000000, 0);

2
sql/updates/Makefile.am
View file

@ -78,6 +78,7 @@ pkgdata_DATA = \
9450_01_mangos_spell_proc_event.sql \ 9450_01_mangos_spell_proc_event.sql \
9460_01_mangos_spell_bonus_data.sql \ 9460_01_mangos_spell_bonus_data.sql \
9460_02_mangos_spell_chain.sql \ 9460_02_mangos_spell_chain.sql \
9464_01_mangos_spell_proc_event.sql \
README README
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
@ -136,4 +137,5 @@ EXTRA_DIST = \
9450_01_mangos_spell_proc_event.sql \ 9450_01_mangos_spell_proc_event.sql \
9460_01_mangos_spell_bonus_data.sql \ 9460_01_mangos_spell_bonus_data.sql \
9460_02_mangos_spell_chain.sql \ 9460_02_mangos_spell_chain.sql \
9464_01_mangos_spell_proc_event.sql \
README README

31
src/game/SpellAuras.cpp
View file

@ -6031,26 +6031,49 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
else else
return; return;
} }
// Combustion (remove triggered aura stack)
else if (m_spellProto->Id == 11129) switch(GetId())
{
case 11129: // Combustion (remove triggered aura stack)
{ {
if(!apply) if(!apply)
spellId1 = 28682; spellId1 = 28682;
else else
return; return;
break;
} }
// Combustion (remove main aura) case 28682: // Combustion (remove main aura)
else if (m_spellProto->Id == 28682)
{ {
if(!apply) if(!apply)
spellId1 = 11129; spellId1 = 11129;
else else
return; return;
break;
}
case 44401: // Missile Barrage (triggered)
case 48108: // Hot Streak (triggered)
case 57761: // Fireball! (Brain Freeze triggered)
{
// consumed aura
if (!apply && m_removeMode == AURA_REMOVE_BY_DEFAULT && m_duration != 0)
{
Unit* caster = GetCaster();
// Item - Mage T10 2P Bonus
if (!caster || !caster->HasAura(70752))
return;
cast_at_remove = true;
spellId1 = 70753; // Pushing the Limit
} }
else else
return; return;
break; break;
} }
default:
return;
}
break;
}
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
{ {
if(!apply) if(!apply)

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 "9463" #define REVISION_NR "9464"
#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_9375_01_characters_character_glyphs" #define REVISION_DB_CHARACTERS "required_9375_01_characters_character_glyphs"
#define REVISION_DB_MANGOS "required_9460_02_mangos_spell_chain" #define REVISION_DB_MANGOS "required_9464_01_mangos_spell_proc_event"
#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__