Dragonflight/DawnOfTheInfinite/Morchie: Remove pre-10.2 compat

BigWigsMods · Nov 8, 2023 · 9f74594 · 9f74594
1 parent 7ce789d
commit 9f74594
Showing 1 changed file with 33 additions and 82 deletions.
diff --git a/Dragonflight/DawnOfTheInfinite/Morchie.lua b/Dragonflight/DawnOfTheInfinite/Morchie.lua
@@ -1,4 +1,3 @@
-local isTenDotTwo = select(4, GetBuildInfo()) >= 100200 --- XXX delete when 10.2 is live everywhere
 --------------------------------------------------------------------------------
 -- Module Declaration
 --
@@ -60,18 +59,10 @@ function mod:OnEngage()
 	moreProblemsCount = 1
 	familiarFacesCount = 1
 	timeTrapsCount = 1
-	if isTenDotTwo then
-		self:CDBar(404916, 3.0) -- Sand Blast
-		self:CDBar(403891, 10.0) -- More Problems!
-		self:CDBar(406481, 36.0) -- Time Traps
-		self:CDBar(405279, 43.0) -- Familiar Faces
-	else
-		-- XXX delete when 10.2 is live everywhere
-		self:CDBar(404916, 4.8) -- Sand Blast
-		self:CDBar(403891, 10.1) -- More Problems!
-		self:CDBar(406481, 30.3) -- Time Traps
-		self:CDBar(405279, 38.5) -- Familiar Faces
-	end
+	self:CDBar(404916, 3.0) -- Sand Blast
+	self:CDBar(403891, 10.0) -- More Problems!
+	self:CDBar(406481, 36.0) -- Time Traps
+	self:CDBar(405279, 43.0) -- Familiar Faces
 end
 
 --------------------------------------------------------------------------------
@@ -84,28 +75,17 @@ function mod:SandBlast(args)
 	self:Message(args.spellId, "purple")
 	self:PlaySound(args.spellId, "alarm")
 	sandBlastCount = sandBlastCount + 1
-	if isTenDotTwo then
-		-- pull:3.0, 27.0, 20.0, 29.0, 12.0, 12.0, 12.0, 24.0, 12.0, 12.0, 12.0, 24.0
-		if sandBlastCount == 2 then
-			self:CDBar(args.spellId, 27.0)
-		elseif sandBlastCount == 3 then
-			self:CDBar(args.spellId, 20.0)
-		elseif sandBlastCount == 4 then
-			self:CDBar(args.spellId, 29.0)
-		elseif sandBlastCount % 4 ~= 0 then -- 5, 6, 7, 9, 10, 11...
-			self:CDBar(args.spellId, 12.0)
-		else -- 8, 12...
-			self:CDBar(args.spellId, 24.0)
-		end
-	else -- XXX delete when 10.2 is live everywhere
-		-- pull:4.8, 38.8, 29.2, 21.9, 29.1
-		if sandBlastCount == 2 then
-			self:CDBar(args.spellId, 38.8)
-		elseif sandBlastCount % 2 == 1 then
-			self:CDBar(args.spellId, 29.1)
-		else
-			self:CDBar(args.spellId, 21.8)
-		end
+	-- pull:3.0, 27.0, 20.0, 29.0, 12.0, 12.0, 12.0, 24.0, 12.0, 12.0, 12.0, 24.0
+	if sandBlastCount == 2 then
+		self:CDBar(args.spellId, 27.0)
+	elseif sandBlastCount == 3 then
+		self:CDBar(args.spellId, 20.0)
+	elseif sandBlastCount == 4 then
+		self:CDBar(args.spellId, 29.0)
+	elseif sandBlastCount % 4 ~= 0 then -- 5, 6, 7, 9, 10, 11...
+		self:CDBar(args.spellId, 12.0)
+	else -- 8, 12...
+		self:CDBar(args.spellId, 24.0)
 	end
 end
 
@@ -122,22 +102,11 @@ do
 		self:Message(args.spellId, "cyan")
 		self:PlaySound(args.spellId, "long")
 		moreProblemsCount = moreProblemsCount + 1
-		if isTenDotTwo then
-			-- pull:10.0, 50.0, 60.0, 60.0, 60.0
-			if moreProblemsCount == 2 then
-				self:CDBar(args.spellId, 50.0)
-			else
-				self:CDBar(args.spellId, 60.0)
-			end
-		else -- XXX delete when 10.2 is live everywhere
-			-- pull:10.1, 40.0, 47.4, 51.1, 52.2, 51.0, 51.0
-			if moreProblemsCount == 2 then
-				self:CDBar(args.spellId, 39.7)
-			elseif moreProblemsCount == 3 then
-				self:CDBar(args.spellId, 47.4)
-			else
-				self:CDBar(args.spellId, 51.0)
-			end
+		-- pull:10.0, 50.0, 60.0, 60.0, 60.0
+		if moreProblemsCount == 2 then
+			self:CDBar(args.spellId, 50.0)
+		else
+			self:CDBar(args.spellId, 60.0)
 		end
 	end
 
@@ -178,44 +147,26 @@ function mod:FamiliarFaces(args)
 	self:Message(405279, "yellow")
 	self:PlaySound(405279, "alert")
 	familiarFacesCount = familiarFacesCount + 1
-	if isTenDotTwo then
-		-- first cast 405279 = pull:43.0
-		-- reactivate 407504 = pull:96.0, 48.0, 24.0, 48.0, 48.0, 24.0, 48.0, 48.0
-		if familiarFacesCount == 2 then
-			self:CDBar(405279, 53.0)
-		elseif familiarFacesCount % 3 == 1 then -- 4, 7, 10...
-			self:CDBar(405279, 24.0)
-		else -- 3, 5, 6, 8, 9...
-			self:CDBar(405279, 48.0)
-		end
-	else -- XXX delete when 10.2 is live everywhere
-		-- first cast 405279 = pull:38.8
-		-- reactivate 407504 = pull:68.2, 20.6, 29.2, 21.9, 29.2, 21.9, 29.1, 21.8, 29.1, 23.1, 29.1
-		if familiarFacesCount == 2 then
-			self:CDBar(405279, 30.4)
-		elseif familiarFacesCount == 3 then
-			self:CDBar(405279, 20.6)
-		elseif familiarFacesCount % 2 == 0 then
-			self:CDBar(405279, 29.1)
-		else
-			self:CDBar(405279, 21.8)
-		end
+	-- first cast 405279 = pull:43.0
+	-- reactivate 407504 = pull:96.0, 48.0, 24.0, 48.0, 48.0, 24.0, 48.0, 48.0
+	if familiarFacesCount == 2 then
+		self:CDBar(405279, 53.0)
+	elseif familiarFacesCount % 3 == 1 then -- 4, 7, 10...
+		self:CDBar(405279, 24.0)
+	else -- 3, 5, 6, 8, 9...
+		self:CDBar(405279, 48.0)
 	end
 end
 
 function mod:TimeTraps(args)
 	self:Message(args.spellId, "green")
 	self:PlaySound(args.spellId, "info")
 	timeTrapsCount = timeTrapsCount + 1
-	if isTenDotTwo then
-		-- pull:36.0, 48.0, 24.0, 48.0, 48.0, 24.0
-		if timeTrapsCount % 3 == 0 then
-			self:CDBar(args.spellId, 24.0)
-		else
-			self:CDBar(args.spellId, 48.0)
-		end
-	else -- XXX delete when 10.2 is live everywhere
-		self:CDBar(args.spellId, 50.9)
+	-- pull:36.0, 48.0, 24.0, 48.0, 48.0, 24.0
+	if timeTrapsCount % 3 == 0 then
+		self:CDBar(args.spellId, 24.0)
+	else
+		self:CDBar(args.spellId, 48.0)
 	end
 end