Merge branch 'Hekili:cataclysm' into cataclysm

Hekili · Aug 16, 2024 · 10ad725 · 10ad725
2 parents bbfd61c + 33eb559
commit 10ad725
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Cataclysm/Classes.lua b/Cataclysm/Classes.lua
@@ -193,7 +193,7 @@ all:RegisterAuras({
 })
 
 all:RegisterAbilities( {
-    -- Phase 4
+    -- Cataclysm Trinkets
 
     figurine_demon_panther = {
         cast = 0,
@@ -205,6 +205,19 @@ all:RegisterAbilities( {
         toggle = "cooldowns",
     },
 
+    soul_casket = {
+        cast = 0,
+        cooldown = 120,
+        gcd = "off",
+
+        item = 58183,
+
+        toggle = "cooldowns",
+    },
+
+
+    -- Phase 4
+
     abracadaver = {
         cast = 0,
         cooldown = 900,

diff --git a/Cataclysm/Warlock.lua b/Cataclysm/Warlock.lua
@@ -1725,7 +1725,8 @@ spec:RegisterAbilities( {
         end,
     },
 
-    -- Begins a ritual that creates a Soulwell.  Raid members can click the Soulwell to acquire a Healthstone.  The Soulwell lasts for 3 min or 25 charges.  Requires the caster and 2 additional party members to complete the ritual.  In order to participate, all players must right-click the soul portal and not move until the ritual is complete.
+	-- Commented out to fix issue #3441
+    --[[ Begins a ritual that creates a Soulwell.  Raid members can click the Soulwell to acquire a Healthstone.  The Soulwell lasts for 3 min or 25 charges.  Requires the caster and 2 additional party members to complete the ritual.  In order to participate, all players must right-click the soul portal and not move until the ritual is complete.
     ritual_of_souls = {
         id = 29893,
         cast = 60,
@@ -1761,7 +1762,7 @@ spec:RegisterAbilities( {
 
         handler = function()
         end,
-    },
+    }, ]]
 
     -- Inflict searing pain on the enemy target, causing 310 Fire damage.  Causes a high amount of threat.SoulburnSoulburn: Increases the critical effect chance of your next Searing Pain by 100%, and your subsequent Searing Pain casts by 50% for 6 sec.
     searing_pain = {