From 1340a3d3825895f768c4fdc699a91f3382fef641 Mon Sep 17 00:00:00 2001 From: tobmaps Date: Fri, 24 Jun 2011 23:04:16 +0700 Subject: Core/Spells: Fix Paladin T8 Holy 2P Bonus --- sql/base/world_database.sql | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/base') diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index c3347731ab3..436102d9890 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -16959,6 +16959,7 @@ INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`a (53600, 0, 0, 0, 0 ,'Paladin - Shield of Righteousness'), (20267, 0, 0, 0, 0, 'Paladin - Judgement of Light Proc'), (25997, 0, 0, 0, 0, 'Paladin - Eye for an Eye'), +(64891, -1, 0, -1, -1, 'Paladin - T8 Holy 2P - Holy Mending'), (50256, -1, -1, 0.08, -1, 'Pet Skills - Bear (Swipe)'), (32546, 0.8068, -1, -1, -1, 'Priest - Binding Heal'), (27813, 0, 0, 0, 0, 'Priest - Blessed Recovery Rank 1'), -- cgit v1.2.3 From 66362cbc1de79ebbfbd99415d18ef4609cf53f36 Mon Sep 17 00:00:00 2001 From: Shocker Date: Sat, 25 Jun 2011 18:16:45 +0300 Subject: Core/Misc: Typo fix in trinity_string Thanks to sebid, closes #2100 --- sql/base/world_database.sql | 2 +- sql/updates/world/2011_06_25_11_world_trinity_string.sql | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2011_06_25_11_world_trinity_string.sql (limited to 'sql/base') diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index 436102d9890..dc601b4d268 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -27582,7 +27582,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_ (1131, 'The following characters match your query:', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1132, 'Currently Banned Characters:', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1133, '| Character | BanDate | UnbanDate | Banned By | Ban Reason |', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(1200, 'You try to view cinemitic %u but it doesn''t exist.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(1200, 'You try to view cinematic %u but it doesn''t exist.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1201, 'You try to view movie %u but it doesn''t exist.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1205, 'The battle will begin in two minutes.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1206, 'The battle will begin in 1 minute.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), diff --git a/sql/updates/world/2011_06_25_11_world_trinity_string.sql b/sql/updates/world/2011_06_25_11_world_trinity_string.sql new file mode 100644 index 00000000000..cb4cbbe4a95 --- /dev/null +++ b/sql/updates/world/2011_06_25_11_world_trinity_string.sql @@ -0,0 +1 @@ +UPDATE `trinity_string` SET `content_default`='You try to view cinematic %u but it doesn\'t exist.' WHERE entry='1200'; -- cgit v1.2.3 From af023a40f745c48dc7e2e0ff8e45d2e79cff8717 Mon Sep 17 00:00:00 2001 From: tobmaps Date: Sat, 25 Jun 2011 23:23:14 +0700 Subject: Core/Spells: Fix Shaman T10 Elemental 4P Bonus Closes #1501 --- sql/base/world_database.sql | 1 + .../world/2011_06_25_14_world_spell_proc_event.sql | 3 +++ src/server/game/Entities/Unit/Unit.cpp | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 sql/updates/world/2011_06_25_14_world_spell_proc_event.sql (limited to 'sql/base') diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index dc601b4d268..97c48dc7056 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -19401,6 +19401,7 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam ( 70803, 0x00, 8, 0x003E0000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Rogue T10 4P Bonus ( 70805, 0x00, 8, 0x00000000, 0x00020000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Item - Rogue T10 2P Bonus ( 70807, 0x00, 11, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Shaman T10 Restoration 2P Bonus +( 70817, 0x00, 11, 0x00000000, 0x00001000, 0x00000000, 0x00010000, 0x00000000, 0, 0, 0), -- Item - Shaman T10 Elemental 4P Bonus ( 70830, 0x00, 11, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Shaman T10 Enhancement 2P Bonus ( 70841, 0x00, 5, 0x00000004, 0x00000100, 0x00000000, 0x00040000, 0x00000000, 0, 0, 0), -- Item - Warlock T10 4P Bonus ( 70844, 0x00, 4, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Warrior T10 Protection 4P Bonus diff --git a/sql/updates/world/2011_06_25_14_world_spell_proc_event.sql b/sql/updates/world/2011_06_25_14_world_spell_proc_event.sql new file mode 100644 index 00000000000..b78a9c087a9 --- /dev/null +++ b/sql/updates/world/2011_06_25_14_world_spell_proc_event.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_proc_event` WHERE `entry` = 70817; +INSERT INTO `spell_proc_event` VALUES +(70817,0,11,0,0x1000,0,0x10000,0,0,0,0); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 67c5db70d1e..fd8be29c3e0 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7252,6 +7252,26 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger } return false; } + // Item - Shaman T10 Elemental 4P Bonus + case 70817: + { + // try to find spell Flame Shock on the target + if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, 0x10000000, 0x0, 0x0, GetGUID())) + { + Aura* flameShock = aurEff->GetBase(); + int32 maxDuration = flameShock->GetMaxDuration(); + int32 newDuration = flameShock->GetDuration() + 2 * aurEff->GetAmplitude(); + + flameShock->SetDuration(newDuration); + // is it blizzlike to change max duration for FS? + if (newDuration > maxDuration) + flameShock->SetMaxDuration(newDuration); + + return true; + } + // if not found Flame Shock + return false; + } case 63280: // Glyph of Totem of Wrath { if (procSpell->SpellIconID != 2019) -- cgit v1.2.3 From aa0e279b04d0b39515d08db5d04c60cbf257eab1 Mon Sep 17 00:00:00 2001 From: Ramusik Date: Sun, 26 Jun 2011 00:44:09 +0700 Subject: Core/Spells: Fix Glyph of Raptor Strike --- sql/base/world_database.sql | 1 + sql/updates/world/2011_06_25_16_world_spell_proc_event.sql | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 sql/updates/world/2011_06_25_16_world_spell_proc_event.sql (limited to 'sql/base') diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index 97c48dc7056..35f79bc11cf 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -19355,6 +19355,7 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam ( 54832, 0x00, 7, 0x00000000, 0x00001000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Glyph of Innervate ( 67353, 0x00, 7, 0x00008000, 0x00100500, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- uncommented ( 57989, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0, 0, 0), -- uncommented +( 63086, 0x00, 9, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0, 0, 0), -- Glyph of Raptor Strike ( 65661, 0x00, 15, 0x00400011, 0x20020004, 0x00000000, 0x00000010, 0x00000000, 0, 100, 0), -- Threat of Thassarian (Rank 1) ( 66191, 0x00, 15, 0x00400011, 0x20020004, 0x00000000, 0x00000010, 0x00000000, 0, 100, 0), -- Threat of Thassarian (Rank 2) ( 66192, 0x00, 15, 0x00400011, 0x20020004, 0x00000000, 0x00000010, 0x00000000, 0, 100, 0), -- Threat of Thassarian (Rank 3) diff --git a/sql/updates/world/2011_06_25_16_world_spell_proc_event.sql b/sql/updates/world/2011_06_25_16_world_spell_proc_event.sql new file mode 100644 index 00000000000..d7ee64c667c --- /dev/null +++ b/sql/updates/world/2011_06_25_16_world_spell_proc_event.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_proc_event` WHERE `entry` = 63086; +INSERT INTO `spell_proc_event` VALUES +(63086, 0x00, 9, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0, 0, 0); -- cgit v1.2.3