Browse Source

DBM Naxx Thaddius

Roman Hergenreder 1 year ago
parent
commit
f3775524b6
3 changed files with 49 additions and 30 deletions
  1. 8 8
      Patches/DBM-Core.patch
  2. 10 10
      Patches/DBM-GUI.patch
  3. 31 12
      Patches/DBM-Naxx.patch

+ 8 - 8
Patches/DBM-Core.patch

@@ -1,5 +1,5 @@
-diff -ruN /tmp/tmp556h65qs/DBM-Core/DBM-BossHealth.lua ./DBM-BossHealth.lua
---- /tmp/tmp556h65qs/DBM-Core/DBM-BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-Core/DBM-BossHealth.lua ./DBM-BossHealth.lua
+--- /tmp/tmp6l0o803l/DBM-Core/DBM-BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
 +++ ./DBM-BossHealth.lua	2022-10-23 19:11:05.902083115 +0200
 @@ -0,0 +1,287 @@
 +---------------
@@ -289,8 +289,8 @@ diff -ruN /tmp/tmp556h65qs/DBM-Core/DBM-BossHealth.lua ./DBM-BossHealth.lua
 +		updateBarStyle(v, i)
 +	end
 +end
-diff -ruN /tmp/tmp556h65qs/DBM-Core/DBM-BossHealth.xml ./DBM-BossHealth.xml
---- /tmp/tmp556h65qs/DBM-Core/DBM-BossHealth.xml	1970-01-01 01:00:00.000000000 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-Core/DBM-BossHealth.xml ./DBM-BossHealth.xml
+--- /tmp/tmp6l0o803l/DBM-Core/DBM-BossHealth.xml	1970-01-01 01:00:00.000000000 +0100
 +++ ./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,8 +364,8 @@ diff -ruN /tmp/tmp556h65qs/DBM-Core/DBM-BossHealth.xml ./DBM-BossHealth.xml
 +		</Frames>
 +	</Frame>
 +</Ui>
-diff -ruN /tmp/tmp556h65qs/DBM-Core/DBM-Core.lua ./DBM-Core.lua
---- /tmp/tmp556h65qs/DBM-Core/DBM-Core.lua	2022-11-03 22:40:13.181251128 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-Core/DBM-Core.lua ./DBM-Core.lua
+--- /tmp/tmp6l0o803l/DBM-Core/DBM-Core.lua	2022-11-03 23:44:49.409757925 +0100
 +++ ./DBM-Core.lua	2022-11-03 22:40:11.591252061 +0100
 @@ -370,6 +370,15 @@
  	ChatFrame = "DEFAULT_CHAT_FRAME",
@@ -420,8 +420,8 @@ diff -ruN /tmp/tmp556h65qs/DBM-Core/DBM-Core.lua ./DBM-Core.lua
 +function bossModPrototype:SetBossHealthInfo(...)
 +	self.bossHealthInfo = {...}
 +end
-diff -ruN /tmp/tmp556h65qs/DBM-Core/DBM-Core.toc ./DBM-Core.toc
---- /tmp/tmp556h65qs/DBM-Core/DBM-Core.toc	2022-11-03 22:40:13.177917797 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-Core/DBM-Core.toc ./DBM-Core.toc
+--- /tmp/tmp6l0o803l/DBM-Core/DBM-Core.toc	2022-11-03 23:44:49.406424600 +0100
 +++ ./DBM-Core.toc	2022-11-03 22:32:45.724645234 +0100
 @@ -85,3 +85,7 @@
  modules\UpdateReminder.lua

+ 10 - 10
Patches/DBM-GUI.patch

@@ -1,5 +1,5 @@
-diff -ruN /tmp/tmp556h65qs/DBM-GUI/AddOns/DBM-GUI/modules/options/frames/BossHealth.lua ./AddOns/DBM-GUI/modules/options/frames/BossHealth.lua
---- /tmp/tmp556h65qs/DBM-GUI/AddOns/DBM-GUI/modules/options/frames/BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-GUI/AddOns/DBM-GUI/modules/options/frames/BossHealth.lua ./AddOns/DBM-GUI/modules/options/frames/BossHealth.lua
+--- /tmp/tmp6l0o803l/DBM-GUI/AddOns/DBM-GUI/modules/options/frames/BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
 +++ ./AddOns/DBM-GUI/modules/options/frames/BossHealth.lua	2022-11-03 21:45:04.829649109 +0100
 @@ -0,0 +1,46 @@
 +local L = DBM_GUI_L
@@ -49,16 +49,16 @@ diff -ruN /tmp/tmp556h65qs/DBM-GUI/AddOns/DBM-GUI/modules/options/frames/BossHea
 +        DBM.BossHealth:AddBoss(createDummyFunc(100), "TestBoss 4")			
 +end)
 \ Kein Zeilenumbruch am Dateiende.
-diff -ruN /tmp/tmp556h65qs/DBM-GUI/DBM-GUI.toc ./DBM-GUI.toc
---- /tmp/tmp556h65qs/DBM-GUI/DBM-GUI.toc	2022-11-03 22:40:13.204584447 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-GUI/DBM-GUI.toc ./DBM-GUI.toc
+--- /tmp/tmp6l0o803l/DBM-GUI/DBM-GUI.toc	2022-11-03 23:44:49.433091207 +0100
 +++ ./DBM-GUI.toc	2022-11-03 21:58:44.955032367 +0100
 @@ -74,3 +74,4 @@
  modules\options\frames\InfoFrame.lua
  modules\options\frames\Range.lua
  modules\options\frames\Nameplate.lua
 +modules\options\frames\BossHealth.lua
-diff -ruN /tmp/tmp556h65qs/DBM-GUI/localization.de.lua ./localization.de.lua
---- /tmp/tmp556h65qs/DBM-GUI/localization.de.lua	2022-11-03 22:40:13.204584447 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-GUI/localization.de.lua ./localization.de.lua
+--- /tmp/tmp6l0o803l/DBM-GUI/localization.de.lua	2022-11-03 23:44:49.433091207 +0100
 +++ ./localization.de.lua	2022-11-03 22:29:15.121522894 +0100
 @@ -466,3 +466,11 @@
  L.Area_Position="Position"
@@ -73,8 +73,8 @@ diff -ruN /tmp/tmp556h65qs/DBM-GUI/localization.de.lua ./localization.de.lua
 +L.HP_ShowDemo				= "Zeige Lebensanzeige"
 +L.BarWidth					= "Balkenbreite: %d"
 \ Kein Zeilenumbruch am Dateiende.
-diff -ruN /tmp/tmp556h65qs/DBM-GUI/localization.en.lua ./localization.en.lua
---- /tmp/tmp556h65qs/DBM-GUI/localization.en.lua	2022-11-03 22:40:13.204584447 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-GUI/localization.en.lua ./localization.en.lua
+--- /tmp/tmp6l0o803l/DBM-GUI/localization.en.lua	2022-11-03 23:44:49.433091207 +0100
 +++ ./localization.en.lua	2022-11-03 22:30:15.074758448 +0100
 @@ -489,3 +489,12 @@
  L.FontType					= "Select font"
@@ -90,8 +90,8 @@ diff -ruN /tmp/tmp556h65qs/DBM-GUI/localization.en.lua ./localization.en.lua
 +L.HP_ShowDemo				= "Show HP frame"
 +L.BarWidth					= "Bar width: %d"
 \ Kein Zeilenumbruch am Dateiende.
-diff -ruN /tmp/tmp556h65qs/DBM-GUI/modules/options/frames/BossHealth.lua ./modules/options/frames/BossHealth.lua
---- /tmp/tmp556h65qs/DBM-GUI/modules/options/frames/BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-GUI/modules/options/frames/BossHealth.lua ./modules/options/frames/BossHealth.lua
+--- /tmp/tmp6l0o803l/DBM-GUI/modules/options/frames/BossHealth.lua	1970-01-01 01:00:00.000000000 +0100
 +++ ./modules/options/frames/BossHealth.lua	2022-11-03 22:31:10.621334700 +0100
 @@ -0,0 +1,46 @@
 +local L = DBM_GUI_L

+ 31 - 12
Patches/DBM-Naxx.patch

@@ -1,5 +1,5 @@
-diff -ruN /tmp/tmp556h65qs/DBM-Naxx/ConstructQuarter/Thaddius.lua ./ConstructQuarter/Thaddius.lua
---- /tmp/tmp556h65qs/DBM-Naxx/ConstructQuarter/Thaddius.lua	2022-11-03 22:40:13.157917808 +0100
+diff -ruN /tmp/tmp6l0o803l/DBM-Naxx/ConstructQuarter/Thaddius.lua ./ConstructQuarter/Thaddius.lua
+--- /tmp/tmp6l0o803l/DBM-Naxx/ConstructQuarter/Thaddius.lua	2022-11-03 23:44:49.386424643 +0100
 +++ ./ConstructQuarter/Thaddius.lua	2022-11-03 22:26:01.801839916 +0100
 @@ -14,6 +14,11 @@
  	"UNIT_AURA player"
@@ -13,15 +13,34 @@ diff -ruN /tmp/tmp556h65qs/DBM-Naxx/ConstructQuarter/Thaddius.lua ./ConstructQua
  local warnShiftSoon			= mod:NewPreWarnAnnounce(28089, 5, 3)
  local warnShiftCasting		= mod:NewCastAnnounce(28089, 4)
  local warnThrow				= mod:NewSpellAnnounce(28338, 2)
-diff -ruN /tmp/tmp556h65qs/DBM-Naxx/localization.de.lua ./localization.de.lua
---- /tmp/tmp556h65qs/DBM-Naxx/localization.de.lua	2022-11-03 22:40:13.157917808 +0100
-+++ ./localization.de.lua	2022-11-03 22:25:15.948582240 +0100
-@@ -18,6 +18,8 @@
- 	ArachnophobiaTimer	= "Arachnophobie",
- 	Pull1				= "Rennt! Das bringt das Blut in Wallung!",
- 	Pull2				= "Nur einmal kosten..." --needs to be verified (wowhead-captured translation)
-+	Boss1 				= "Feugen",
-+	Boss2 				= "Stalagg",
+diff -ruN /tmp/tmp6l0o803l/DBM-Naxx/localization.de.lua ./localization.de.lua
+--- /tmp/tmp6l0o803l/DBM-Naxx/localization.de.lua	2022-11-03 23:44:49.386424643 +0100
++++ ./localization.de.lua	2022-11-03 23:44:33.866458293 +0100
+@@ -201,7 +201,9 @@
+ 	Boss1	= "Feugen",
+ 	Boss2	= "Stalagg",
+ 	Charge1 = "negativ",
+-	Charge2 = "positiv"
++	Charge2 = "positiv",
++	Boss1   = "Feugen",
++	Boss2   = "Stalagg",
  })
  
- ----------------------------
+ L:SetOptionLocalization({
+diff -ruN /tmp/tmp6l0o803l/DBM-Naxx/MilitaryQuarter/Horsemen.lua ./MilitaryQuarter/Horsemen.lua
+--- /tmp/tmp6l0o803l/DBM-Naxx/MilitaryQuarter/Horsemen.lua	2022-11-03 23:44:49.386424643 +0100
++++ ./MilitaryQuarter/Horsemen.lua	2022-11-03 23:41:59.683478128 +0100
+@@ -18,6 +18,13 @@
+ 	"SPELL_AURA_APPLIED_DOSE 28832 28833 28834 28835"
+ )
+ 
++mod:SetBossHealthInfo(
++	16064, L.Korthazz,
++	30549, L.Rivendare,
++	16065, L.Blaumeux,
++	16063, L.Zeliek
++)
++
+ --TODO, first marks
+ --TODO, verify stuff migrated from naxx 40
+ local warnMarkSoon				= mod:NewAnnounce("WarningMarkSoon", 1, 28835, false, nil, nil, 28835)