DBM BossHealth Thaddius

addons.py

@@ -1,5 +1,5 @@
-diff -ruN /tmp/tmpkdmwjks5/DBM-Core/DBM-BossHealth.lua ./AddOns/DBM-Core/DBM-BossHealth.lua
---- /tmp/tmpkdmwjks5/DBM-Core/DBM-BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
+diff -ruN /tmp/tmpasjqcnie/DBM-Core/DBM-BossHealth.lua ./AddOns/DBM-Core/DBM-BossHealth.lua
+--- /tmp/tmpasjqcnie/DBM-Core/DBM-BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
 +++ ./AddOns/DBM-Core/DBM-BossHealth.lua	2022-10-23 19:11:05.902083115 +0200
 @@ -0,0 +1,287 @@
 +---------------
@@ -289,8 +289,8 @@ diff -ruN /tmp/tmpkdmwjks5/DBM-Core/DBM-BossHealth.lua ./AddOns/DBM-Core/DBM-Bos
 +		updateBarStyle(v, i)
 +	end
 +end
-diff -ruN /tmp/tmpkdmwjks5/DBM-Core/DBM-BossHealth.xml ./AddOns/DBM-Core/DBM-BossHealth.xml
---- /tmp/tmpkdmwjks5/DBM-Core/DBM-BossHealth.xml	1970-01-01 01:00:00.000000000 +0100
+diff -ruN /tmp/tmpasjqcnie/DBM-Core/DBM-BossHealth.xml ./AddOns/DBM-Core/DBM-BossHealth.xml
+--- /tmp/tmpasjqcnie/DBM-Core/DBM-BossHealth.xml	1970-01-01 01:00:00.000000000 +0100
 +++ ./AddOns/DBM-Core/DBM-BossHealth.xml	2022-10-23 12:32:08.208657820 +0200
 @@ -0,0 +1,71 @@
 +<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
@@ -364,78 +364,3 @@ diff -ruN /tmp/tmpkdmwjks5/DBM-Core/DBM-BossHealth.xml ./AddOns/DBM-Core/DBM-Bos
 +		</Frames>
 +	</Frame>
 +</Ui>
-diff -ruN /tmp/tmpkdmwjks5/DBM-Core/DBM-Core.lua ./AddOns/DBM-Core/DBM-Core.lua
---- /tmp/tmpkdmwjks5/DBM-Core/DBM-Core.lua	2022-10-26 22:58:00.300766068 +0200
-+++ ./AddOns/DBM-Core/DBM-Core.lua	2022-10-26 21:07:22.907587225 +0200
-@@ -370,6 +370,16 @@
- 	ChatFrame = "DEFAULT_CHAT_FRAME",
- 	CoreSavedRevision = 1,
- 	SilentMode = false,
-+	-- Custom
-+	AlwaysShowHealthFrame = false,
-+	HealthFrameGrowUp = false,
-+	HealthFrameLocked = false,
-+	HealthFrameWidth = 200,
-+	HPFramePoint = "CENTER",
-+	HPFrameX = -50,
-+	HPFrameY = 50,
-+	HPFrameMaxEntries = 5,
-+
- }
- 
- DBM.Mods = {}
-@@ -5020,6 +5030,19 @@
- 						end
- 					end
- 				end
-+
-+				-- Custom
-+				if (DBM.Options.AlwaysShowHealthFrame or mod.Options.HealthFrame) and mod.Options.Enabled then
-+					DBM.BossHealth:Show(mod.localization.general.name)
-+					if mod.bossHealthInfo then
-+						for i = 1, #mod.bossHealthInfo, 2 do
-+							DBM.BossHealth:AddBoss(mod.bossHealthInfo[i], mod.bossHealthInfo[i + 1])
-+						end
-+					else
-+						DBM.BossHealth:AddBoss(mod.combatInfo.mob, mod.localization.general.name)
-+					end
-+				end
-+
- 				--call OnCombatStart
- 				if mod.OnCombatStart then
- 					local startEvent = syncedEvent or event
-@@ -5436,6 +5459,8 @@
- 				self:CreatePizzaTimer(time, "", nil, nil, nil, true)--Auto Terminate infinite loop timers on combat end
- 				self:TransitionToDungeonBGM(false, true)
- 				self:Schedule(22, self.TransitionToDungeonBGM, self)
-+				-- Custom
-+				DBM.BossHealth:Hide()
- 				--module cleanup
- 				private:ClearModuleTasks()
- 			end
-@@ -11162,3 +11187,10 @@
- 	self.localization.miscStrings.name = self.localization.general.name
- 	return self.localization.miscStrings
- end
-+
-+-------------------------
-+--  Boss Health Frame  --
-+-------------------------
-+function bossModPrototype:SetBossHealthInfo(...)
-+	self.bossHealthInfo = {...}
-+end
-\ Kein Zeilenumbruch am Dateiende.
-diff -ruN /tmp/tmpkdmwjks5/DBM-Core/DBM-Core.toc ./AddOns/DBM-Core/DBM-Core.toc
---- /tmp/tmpkdmwjks5/DBM-Core/DBM-Core.toc	2022-10-26 22:58:00.317432801 +0200
-+++ ./AddOns/DBM-Core/DBM-Core.toc	2022-10-23 12:32:46.308588636 +0200
-@@ -85,3 +85,10 @@
- modules\UpdateReminder.lua
- 
- modules\objects\Localization.lua
-+
-+
-+
-+# Custom
-+DBM-BossHealth.lua
-+DBM-BossHealth.xml
-+

patches/DBM-GUI.patch

@@ -1,28 +1,5 @@
-diff -ruN /tmp/tmpkdmwjks5/DBM-GUI/DBM-GUI.toc ./AddOns/DBM-GUI/DBM-GUI.toc
---- /tmp/tmpkdmwjks5/DBM-GUI/DBM-GUI.toc	2022-10-26 22:58:00.327432839 +0200
-+++ ./AddOns/DBM-GUI/DBM-GUI.toc	2022-10-23 15:23:11.962084908 +0200
-@@ -74,3 +74,4 @@
- modules\options\frames\InfoFrame.lua
- modules\options\frames\Range.lua
- modules\options\frames\Nameplate.lua
-+modules\options\frames\BossHealth.lua
-\ Kein Zeilenumbruch am Dateiende.
-diff -ruN /tmp/tmpkdmwjks5/DBM-GUI/localization.de.lua ./AddOns/DBM-GUI/localization.de.lua
---- /tmp/tmpkdmwjks5/DBM-GUI/localization.de.lua	2022-10-26 22:58:00.327432839 +0200
-+++ ./AddOns/DBM-GUI/localization.de.lua	2022-10-23 15:23:11.962084908 +0200
-@@ -466,3 +466,10 @@
- L.Area_Position="Position"
- L.Area_Style="Stil"
- L.Area_General="Allgemein"
-+
-+
-+L.Panel_BossHealth="Lebensanzeige"
-+L.Area_HPFrame                          = "Lebensanzeige-Optionen"
-+L.HP_Enabled                            = "Lebensanzeige immer anzeigen (überschreibt boss-spezifische Option)"
-+L.HP_GrowUpwards                        = "Erweitere Lebensanzeige nach oben"
-+L.HP_ShowDemo                           = "Zeige Lebensanzeige"
-diff -ruN /tmp/tmpkdmwjks5/DBM-GUI/modules/options/frames/BossHealth.lua ./AddOns/DBM-GUI/modules/options/frames/BossHealth.lua
---- /tmp/tmpkdmwjks5/DBM-GUI/modules/options/frames/BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
+diff -ruN /tmp/tmpasjqcnie/DBM-GUI/modules/options/frames/BossHealth.lua ./AddOns/DBM-GUI/modules/options/frames/BossHealth.lua
+--- /tmp/tmpasjqcnie/DBM-GUI/modules/options/frames/BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
 +++ ./AddOns/DBM-GUI/modules/options/frames/BossHealth.lua	2022-10-23 15:23:11.962084908 +0200
 @@ -0,0 +1,46 @@
 +local L = DBM_GUI_L

patches/DBM-Naxx.patch

@@ -1,17 +1,15 @@
-diff -ruN /tmp/tmpkdmwjks5/DBM-Naxx/MilitaryQuarter/Horsemen.lua ./AddOns/DBM-Naxx/MilitaryQuarter/Horsemen.lua
---- /tmp/tmpkdmwjks5/DBM-Naxx/MilitaryQuarter/Horsemen.lua	2022-10-26 22:58:00.280765988 +0200
-+++ ./AddOns/DBM-Naxx/MilitaryQuarter/Horsemen.lua	2022-10-26 21:05:49.814292041 +0200
-@@ -7,6 +7,13 @@
- mod:SetModelID(10729)
- mod:SetBossHPInfoToHighest()
+diff -ruN /tmp/tmpasjqcnie/DBM-Naxx/ConstructQuarter/Thaddius.lua ./AddOns/DBM-Naxx/ConstructQuarter/Thaddius.lua
+--- /tmp/tmpasjqcnie/DBM-Naxx/ConstructQuarter/Thaddius.lua	2022-10-27 11:16:05.290029506 +0200
++++ ./AddOns/DBM-Naxx/ConstructQuarter/Thaddius.lua	2022-10-27 11:15:27.286556724 +0200
+@@ -14,6 +14,11 @@
+ 	"UNIT_AURA player"
+ )
  
 +mod:SetBossHealthInfo(
-+	16064, L.Korthazz,
-+	30549, L.Rivendare,
-+	16065, L.Blaumeux,
-+	16063, L.Zeliek
++	15930, L.Boss1,
++	15929, L.Boss2
 +)
 +
- mod:RegisterCombat("combat")
- 
- mod:RegisterEventsInCombat(
+ local warnShiftSoon			= mod:NewPreWarnAnnounce(28089, 5, 3)
+ local warnShiftCasting		= mod:NewCastAnnounce(28089, 4)
+ local warnThrow				= mod:NewSpellAnnounce(28338, 2)