diff options
-rw-r--r-- | sql/updates/world/2011_09_01_00_world_conditions.sql | 10 | ||||
-rwxr-xr-x | src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp | 12 |
2 files changed, 10 insertions, 12 deletions
diff --git a/sql/updates/world/2011_09_01_00_world_conditions.sql b/sql/updates/world/2011_09_01_00_world_conditions.sql new file mode 100644 index 00000000000..c830d3ad18e --- /dev/null +++ b/sql/updates/world/2011_09_01_00_world_conditions.sql @@ -0,0 +1,10 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `ConditionTypeOrReference` = 18 AND `SourceEntry` IN (65875,67303,67304,67305,65876,67306,67307,67308) ; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 0, 65875, 0, 18, 1, 34497, 2, 0, '', 'Twins Pact - Dark'), +(13, 0, 67303, 0, 18, 1, 34497, 2, 0, '', 'Twins Pact - Dark'), +(13, 0, 67304, 0, 18, 1, 34497, 2, 0, '', 'Twins Pact - Dark'), +(13, 0, 67305, 0, 18, 1, 34497, 2, 0, '', 'Twins Pact - Dark'), +(13, 0, 65876, 0, 18, 1, 34496, 2, 0, '', 'Twins Pact - Light'), +(13, 0, 67306, 0, 18, 1, 34496, 2, 0, '', 'Twins Pact - Light'), +(13, 0, 67307, 0, 18, 1, 34496, 2, 0, '', 'Twins Pact - Light'), +(13, 0, 67308, 0, 18, 1, 34496, 2, 0, '', 'Twins Pact - Light'); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 446a638d6aa..9ef2d183d3b 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -251,18 +251,6 @@ struct boss_twin_baseAI : public ScriptedAI Summons.Despawn(summoned); } - void HealReceived(Unit* healer, uint32& heal) - { - if(healer->GetEntry() == me->GetEntry()) - { - if (Creature* pSister = GetSister()) - { - heal = uint32(heal/2); - healer->DealHeal(pSister, heal); - } - } - } - void SummonColorballs(uint8 quantity) { float x0 = ToCCommonLoc[1].GetPositionX(), y0 = ToCCommonLoc[1].GetPositionY(), r = 47.0f; |