mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 10:37:02 +00:00
[10217] Update playercreateinfo_action/playercreateinfo_spell
* Drop some food action buttons * Drop attack spells for caster classes * Use expected simlifed spell version 20154 (it replaced by full version at learn spell 53408 and similar) In code used helper code for support 2 versions as fake non-stacking ranks. * Some other old "max ranks" of talents and spells now are permanent bonuses known from start (only "max rank" for spell exist) Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
238b57f93e
commit
7bb8b2bedb
10 changed files with 498 additions and 228 deletions
405
sql/mangos.sql
405
sql/mangos.sql
File diff suppressed because it is too large
Load diff
128
sql/updates/10217_01_mangos_playercreateinfo_spell.sql
Normal file
128
sql/updates/10217_01_mangos_playercreateinfo_spell.sql
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
ALTER TABLE db_version CHANGE COLUMN required_10208_01_mangos_playercreateinfo required_10217_01_mangos_playercreateinfo_spell bit;
|
||||
|
||||
DELETE FROM playercreateinfo_spell WHERE spell=1843 ;
|
||||
DELETE FROM playercreateinfo_spell WHERE spell=21084;
|
||||
-- humans
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(1, 1, 68398, 'Opening'),
|
||||
(1, 2, 20154, 'Seal of Righteousness'),
|
||||
(1, 2, 68398, 'Opening'),
|
||||
(1, 4, 68398, 'Opening'),
|
||||
(1, 5, 68398, 'Opening'),
|
||||
(1, 8, 68398, 'Opening'),
|
||||
(1, 8, 71761, 'Deep Freeze Immunity State'),
|
||||
(1, 9, 18822, 'Improved Enslave Demon'),
|
||||
(1, 9, 68398, 'Opening'),
|
||||
(1, 9, 75445, 'Demonic Immolate');
|
||||
|
||||
-- dwarf
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(3, 1, 68398, 'Opening'),
|
||||
(3, 2, 20154, 'Seal of Righteousness'),
|
||||
(3, 2, 68398, 'Opening'),
|
||||
(3, 3, 68398, 'Opening'),
|
||||
(3, 4, 68398, 'Opening'),
|
||||
(3, 5, 68398, 'Opening');
|
||||
|
||||
-- night elfs
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(4, 1, 21009, 'Elusiveness'),
|
||||
(4, 1, 68398, 'Opening'),
|
||||
(4, 3, 21009, 'Elusiveness'),
|
||||
(4, 3, 68398, 'Opening'),
|
||||
(4, 4, 21009, 'Elusiveness'),
|
||||
(4, 4, 68398, 'Opening'),
|
||||
(4, 5, 21009, 'Elusiveness'),
|
||||
(4, 5, 68398, 'Opening'),
|
||||
(4, 11, 66530, 'Improved Barkskin (Passive)'),
|
||||
(4, 11, 68398, 'Opening');
|
||||
|
||||
-- gnome
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(7, 1, 68398, 'Opening'),
|
||||
(7, 4, 68398, 'Opening'),
|
||||
(7, 8, 68398, 'Opening'),
|
||||
(7, 8, 71761, 'Deep Freeze Immunity State'),
|
||||
(7, 9, 18822, 'Improved Enslave Demon'),
|
||||
(7, 9, 68398, 'Opening'),
|
||||
(7, 9, 75445, 'Demonic Immolate');
|
||||
|
||||
-- orc
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(2, 1, 68398, 'Opening'),
|
||||
(2, 3, 68398, 'Opening'),
|
||||
(2, 4, 68398, 'Opening'),
|
||||
(2, 7, 65222, 'Command'),
|
||||
(2, 7, 68398, 'Opening'),
|
||||
(2, 7, 75461, 'Flame Shock Passive'),
|
||||
(2, 9, 18822, 'Improved Enslave Demon'),
|
||||
(2, 9, 68398, 'Opening'),
|
||||
(2, 9, 75445, 'Demonic Immolate');
|
||||
|
||||
-- undead
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(5, 1, 68398, 'Opening'),
|
||||
(5, 4, 68398, 'Opening'),
|
||||
(5, 5, 68398, 'Opening'),
|
||||
(5, 8, 68398, 'Opening'),
|
||||
(5, 8, 71761, 'Deep Freeze Immunity State'),
|
||||
(5, 9, 18822, 'Improved Enslave Demon'),
|
||||
(5, 9, 68398, 'Opening'),
|
||||
(5, 9, 75445, 'Demonic Immolate');
|
||||
|
||||
-- tauren
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(6, 1, 68398, 'Opening'),
|
||||
(6, 3, 68398, 'Opening'),
|
||||
(6, 7, 68398, 'Opening'),
|
||||
(6, 7, 75461, 'Flame Shock Passive'),
|
||||
(6, 11, 66530, 'Improved Barkskin (Passive)'),
|
||||
(6, 11, 68398, 'Opening');
|
||||
|
||||
-- troll
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(8, 1, 68398, 'Opening'),
|
||||
(8, 3, 68398, 'Opening'),
|
||||
(8, 4, 68398, 'Opening'),
|
||||
(8, 5, 68398, 'Opening'),
|
||||
(8, 7, 68398, 'Opening'),
|
||||
(8, 7, 75461, 'Flame Shock Passive'),
|
||||
(8, 8, 68398, 'Opening'),
|
||||
(8, 8, 71761, 'Deep Freeze Immunity State');
|
||||
|
||||
-- bloodelf
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(10, 2, 20154, 'Seal of Righteousness'),
|
||||
(10, 2, 68398, 'Opening'),
|
||||
(10, 3, 68398, 'Opening'),
|
||||
(10, 4, 68398, 'Opening'),
|
||||
(10, 5, 68398, 'Opening'),
|
||||
(10, 8, 68398, 'Opening'),
|
||||
(10, 9, 18822, 'Improved Enslave Demon'),
|
||||
(10, 9, 68398, 'Opening'),
|
||||
(10, 9, 75445, 'Demonic Immolate');
|
||||
|
||||
-- drarenei
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(11, 1, 68398, 'Opening'),
|
||||
(11, 2, 20154, 'Seal of Righteousness'),
|
||||
(11, 2, 68398, 'Opening'),
|
||||
(11, 3, 68398, 'Opening'),
|
||||
(11, 5, 68398, 'Opening'),
|
||||
(11, 7, 68398, 'Opening'),
|
||||
(11, 7, 75461, 'Flame Shock Passive'),
|
||||
(11, 8, 68398, 'Opening'),
|
||||
(11, 8, 71761, 'Deep Freeze Immunity State');
|
||||
|
||||
-- dk
|
||||
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
|
||||
(1, 6, 68398, 'Opening'),
|
||||
(2, 6, 68398, 'Opening'),
|
||||
(3, 6, 68398, 'Opening'),
|
||||
(4, 6, 68398, 'Opening'),
|
||||
(5, 6, 68398, 'Opening'),
|
||||
(6, 6, 68398, 'Opening'),
|
||||
(7, 6, 68398, 'Opening'),
|
||||
(8, 6, 68398, 'Opening'),
|
||||
(10, 6, 68398, 'Opening'),
|
||||
(11, 6, 68398, 'Opening');
|
||||
156
sql/updates/10217_02_mangos_playercreateinfo_action.sql
Normal file
156
sql/updates/10217_02_mangos_playercreateinfo_action.sql
Normal file
|
|
@ -0,0 +1,156 @@
|
|||
ALTER TABLE db_version CHANGE COLUMN required_10217_01_mangos_playercreateinfo_spell required_10217_02_mangos_playercreateinfo_action bit;
|
||||
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE action IN (117, 21084, 159, 2070, 4540);
|
||||
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(1, 1, 1, 78, 0),
|
||||
(1, 1, 9, 59752, 0);
|
||||
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(1, 2, 1, 20154, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE class=5 AND race=1 AND button IN (0,1,2);
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(1, 5, 0, 585, 0),
|
||||
(1, 5, 1, 2050, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE class=8 AND race=1 AND button IN (0,1,2);
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(1, 8, 0, 133, 0),
|
||||
(1, 8, 1, 168, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE class=9 AND race=1 AND button IN (0,1,2);
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(1, 9, 0, 686, 0),
|
||||
(1, 9, 1, 687, 0);
|
||||
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(2, 1, 1, 78, 0),
|
||||
(2, 1, 2, 20572, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action where race=2 AND class=9;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(2, 9, 0, 686, 0),
|
||||
(2, 9, 1, 687, 0),
|
||||
(2, 9, 2, 33702, 0);
|
||||
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(3, 1, 2, 20594, 0),
|
||||
(3, 1, 3, 2481, 0);
|
||||
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(3, 2, 1, 20154, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE class=5 AND race=3 AND button IN (0,1,2,3,4);
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(3, 5, 0, 585, 0),
|
||||
(3, 5, 1, 2050, 0),
|
||||
(3, 5, 2, 20594, 0),
|
||||
(3, 5, 3, 2481, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE class=1 AND race=4;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(4, 1, 0, 6603, 0),
|
||||
(4, 1, 1, 78, 0),
|
||||
(4, 1, 108, 6603, 0),
|
||||
(4, 1, 2, 58984, 0),
|
||||
(4, 1, 72, 6603, 0),
|
||||
(4, 1, 73, 78, 0),
|
||||
(4, 1, 74, 58984, 0),
|
||||
(4, 1, 84, 6603, 0),
|
||||
(4, 1, 96, 6603, 0);
|
||||
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(4, 3, 81, 58984, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE race=4 AND class=4 AND button=10;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(4, 4, 4, 58984, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE race=4 AND class=5 ;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(4, 5, 0, 585, 0),
|
||||
(4, 5, 1, 2050, 0),
|
||||
(4, 5, 2, 58984, 0),
|
||||
(4, 5, 81, 58984, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE race=4 AND class=11 ;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(4, 11, 0, 5176, 0),
|
||||
(4, 11, 1, 5185, 0),
|
||||
(4, 11, 108, 6603, 0),
|
||||
(4, 11, 2, 58984, 0),
|
||||
(4, 11, 72, 6603, 0),
|
||||
(4, 11, 74, 58984, 0),
|
||||
(4, 11, 84, 6603, 0),
|
||||
(4, 11, 96, 6603, 0);
|
||||
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(5, 1, 1, 78, 0),
|
||||
(5, 1, 2, 20577, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action where race=5 AND class=8;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(5, 8, 0, 133, 0),
|
||||
(5, 8, 1, 168, 0),
|
||||
(5, 8, 2, 20577, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action where race=5 AND class=9;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(5, 9, 0, 686, 0),
|
||||
(5, 9, 1, 687, 0),
|
||||
(5, 9, 2, 20577, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action where race=5 AND class=5;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(5, 5, 0, 585, 0),
|
||||
(5, 5, 1, 2050, 0),
|
||||
(5, 5, 2, 20577, 0);
|
||||
|
||||
UPDATE playercreateinfo_action SET button=2 WHERE race=6 AND class=1 AND button=3;
|
||||
UPDATE playercreateinfo_action SET button=75 WHERE race=6 AND class=3 AND button=76;
|
||||
UPDATE playercreateinfo_action SET button=75 WHERE race=6 AND class=7 AND button=76;
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE race=6 AND class=11;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(6, 11, 0, 5176, 0),
|
||||
(6, 11, 1, 5185, 0),
|
||||
(6, 11, 108, 6603, 0),
|
||||
(6, 11, 2, 20549, 0),
|
||||
(6, 11, 72, 6603, 0),
|
||||
(6, 11, 75, 20549, 0),
|
||||
(6, 11, 84, 6603, 0),
|
||||
(6, 11, 96, 6603, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE race=7 AND class=1 AND button in (82,10);
|
||||
DELETE FROM playercreateinfo_action WHERE race=7 AND class=4 AND button in (10);
|
||||
DELETE FROM playercreateinfo_action WHERE race=7 AND class=8;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(7, 8, 0, 133, 0),
|
||||
(7, 8, 1, 168, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE race=7 AND class=9;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(7, 9, 0, 686, 0),
|
||||
(7, 9, 1, 687, 0);
|
||||
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(8, 1, 1, 78, 0),
|
||||
(8, 1, 2, 26297, 0);
|
||||
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(8, 4, 76, 26297, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE race=8 AND class=5;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(8, 5, 0, 585, 0),
|
||||
(8, 5, 1, 2050, 0),
|
||||
(8, 5, 2, 26297, 0);
|
||||
|
||||
DELETE FROM playercreateinfo_action WHERE race=8 AND class=8;
|
||||
INSERT IGNORE INTO playercreateinfo_action (race, class, button, action, type) VALUES
|
||||
(8, 8, 0, 133, 0),
|
||||
(8, 8, 1, 168, 0),
|
||||
(8, 8, 2, 26297, 0);
|
||||
|
||||
8
sql/updates/10217_03_mangos_spell_learn_spell.sql
Normal file
8
sql/updates/10217_03_mangos_spell_learn_spell.sql
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
ALTER TABLE db_version CHANGE COLUMN required_10217_02_mangos_playercreateinfo_action required_10217_03_mangos_spell_learn_spell bit;
|
||||
|
||||
-- 21084 replace of 20154 at learn judgements
|
||||
DELETE FROM spell_learn_spell WHERE SpellID = 21084;
|
||||
INSERT INTO spell_learn_spell VALUES
|
||||
(20271,21084,1),
|
||||
(53407,21084,1),
|
||||
(53408,21084,1);
|
||||
7
sql/updates/10217_04_mangos_spell_chain.sql
Normal file
7
sql/updates/10217_04_mangos_spell_chain.sql
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
ALTER TABLE db_version CHANGE COLUMN required_10217_03_mangos_spell_learn_spell required_10217_04_mangos_spell_chain bit;
|
||||
|
||||
-- 21084 replace of 20154 at learn judgements
|
||||
DELETE FROM spell_chain WHERE first_spell = 20154;
|
||||
INSERT INTO spell_chain VALUES
|
||||
(20154,0,20154,1,0),
|
||||
(21084,20154,20154,2,0);
|
||||
5
sql/updates/10217_05_mangos_spell_proc_event.sql
Normal file
5
sql/updates/10217_05_mangos_spell_proc_event.sql
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
ALTER TABLE db_version CHANGE COLUMN required_10217_04_mangos_spell_chain required_10217_05_mangos_spell_proc_event bit;
|
||||
|
||||
DELETE FROM `spell_proc_event` WHERE entry in (20154, 21084);
|
||||
INSERT INTO `spell_proc_event` VALUES
|
||||
(20154, 0x01, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
|
||||
|
|
@ -111,6 +111,11 @@ pkgdata_DATA = \
|
|||
10205_01_mangos_spell_area.sql \
|
||||
10207_01_mangos_npc_vendor.sql \
|
||||
10208_01_mangos_playercreateinfo.sql \
|
||||
10217_01_mangos_playercreateinfo_spell.sql \
|
||||
10217_02_mangos_playercreateinfo_action.sql \
|
||||
10217_03_mangos_spell_learn_spell.sql \
|
||||
10217_04_mangos_spell_chain.sql \
|
||||
10217_05_mangos_spell_proc_event.sql \
|
||||
README
|
||||
|
||||
## Additional files to include when running 'make dist'
|
||||
|
|
@ -202,4 +207,9 @@ EXTRA_DIST = \
|
|||
10205_01_mangos_spell_area.sql \
|
||||
10207_01_mangos_npc_vendor.sql \
|
||||
10208_01_mangos_playercreateinfo.sql \
|
||||
10217_01_mangos_playercreateinfo_spell.sql \
|
||||
10217_02_mangos_playercreateinfo_action.sql \
|
||||
10217_03_mangos_spell_learn_spell.sql \
|
||||
10217_04_mangos_spell_chain.sql \
|
||||
10217_05_mangos_spell_proc_event.sql \
|
||||
README
|
||||
|
|
|
|||
|
|
@ -1664,6 +1664,9 @@ bool SpellMgr::canStackSpellRanks(SpellEntry const *spellInfo)
|
|||
// Paladin aura Spell
|
||||
if (spellInfo->Effect[i]==SPELL_EFFECT_APPLY_AREA_AURA_RAID)
|
||||
return false;
|
||||
// Seal of Righteousness, 2 version of same rank
|
||||
if ((spellInfo->SpellFamilyFlags & UI64LIT(0x0000000008000000)) && spellInfo->SpellIconID == 25)
|
||||
return false;
|
||||
break;
|
||||
case SPELLFAMILY_DRUID:
|
||||
// Druid form Spell
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "10216"
|
||||
#define REVISION_NR "10217"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#ifndef __REVISION_SQL_H__
|
||||
#define __REVISION_SQL_H__
|
||||
#define REVISION_DB_CHARACTERS "required_10160_02_characters_pet_aura"
|
||||
#define REVISION_DB_MANGOS "required_10208_01_mangos_playercreateinfo"
|
||||
#define REVISION_DB_MANGOS "required_10217_05_mangos_spell_proc_event"
|
||||
#define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
|
||||
#endif // __REVISION_SQL_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue