From 3d9114f78154497529c454e89b75cec6703ef17d Mon Sep 17 00:00:00 2001
From: jarves <jarveson@gmail.com>
Date: Wed, 11 Jan 2023 16:57:00 -0600
Subject: [PATCH] ui/db: 'unify' expose / sunder action id's  - expose no
 longer has a rank  - unify sunder armor action id to always use 'highest'
 rank  - this avoids more unneeded requests

Signed-off-by: jarves <jarveson@gmail.com>
---
 assets/database/db.bin            | Bin 5793674 -> 5793675 bytes
 assets/database/db.json           |   2 +-
 sim/core/debuffs.go               |   2 +-
 tools/database/overrides.go       |   2 +-
 ui/core/components/icon_inputs.ts |   2 +-
 ui/raid/raid_stats.ts             |   2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/database/db.bin b/assets/database/db.bin
index 80b84a7d81c26f01461bc10c5396306074270736..8b2da152d157d293fb39bcc6541bb62c12a4195f 100644
GIT binary patch
delta 210
zcmWN=NiIVH007YVl$z&xR+O66JXX<~XTPWD9V}iVVgIch!A{aMSUG`(wVf02lK1ra
z9X$VkP$p2WLQJJ9an)+ns#C8)qbAK-v})6?L#Hm?di3hkZ@{1-!$u^G8Z$0w!laZb
z(`L+?GjGA7v?a?{tXi{f!=^3UcI?X7leO=_p`5%U$4;C&bMC^WE7xw^x^w>?W~0Yq
a6qbrnA(M`!;y=H^OD+nNrMHj5*Xtk83r$}D

delta 209
zcmWN=NiIVH007XaqGmPEN>MdaQ;qe_^W1+Oi<dNE|E*lXO42iQWiPRC6JGLOzkXvc
z|DRQfsTNnGR-J@;4H`9R)}mFLq;?%Tb?MflSD$_Z1`QcDB4yN=v~d$AWlYJMHe=SD
zc?%XTS(dY6)tYr1@-}VRwqw_xf_;GlhmIUOaq7&u3zx23yK(Ezy$6q;K8ryV&nCX}
WZ>36@DFson97JIuSN^DkKkt8bzD%(I

diff --git a/assets/database/db.json b/assets/database/db.json
index 7504aa2a09..40ccf2bcc0 100644
--- a/assets/database/db.json
+++ b/assets/database/db.json
@@ -9378,7 +9378,6 @@
 {"id":5926,"name":"Holy Power","icon":"spell_holy_power"},
 {"id":5952,"name":"Throwing Specialization","icon":"ability_rogue_throwingspecialization"},
 {"id":6562,"name":"Heroic Presence","icon":"inv_helmet_21"},
-{"id":7386,"name":"Sunder Armor","icon":"ability_warrior_sunder"},
 {"id":8647,"name":"Expose Armor","icon":"ability_warrior_riposte"},
 {"id":9452,"name":"Vindication","icon":"spell_holy_vindication"},
 {"id":9453,"name":"Unyielding Faith","icon":"spell_holy_unyieldingfaith"},
@@ -11017,6 +11016,7 @@
 {"id":47436,"name":"Battle Shout","icon":"ability_warrior_battleshout"},
 {"id":47437,"name":"Demoralizing Shout","icon":"ability_warrior_warcry"},
 {"id":47440,"name":"Commanding Shout","icon":"ability_warrior_rallyingcry"},
+{"id":47467,"name":"Sunder Armor","icon":"ability_warrior_sunder"},
 {"id":47502,"name":"Thunder Clap","icon":"spell_nature_thunderclap"},
 {"id":47507,"name":"Aspiration","icon":"spell_holy_aspiration"},
 {"id":47508,"name":"Aspiration","icon":"spell_holy_aspiration"},
diff --git a/sim/core/debuffs.go b/sim/core/debuffs.go
index 7bb9bece24..883dd51a3d 100644
--- a/sim/core/debuffs.go
+++ b/sim/core/debuffs.go
@@ -609,7 +609,7 @@ func ExposeArmorAura(target *Unit, hasGlyph bool) *Aura {
 	const armorReduction = 0.2
 	aura := target.GetOrRegisterAura(Aura{
 		Label:    "ExposeArmor",
-		ActionID: ActionID{SpellID: 48669},
+		ActionID: ActionID{SpellID: 8647},
 		Duration: time.Second * TernaryDuration(hasGlyph, 42, 30),
 	})
 
diff --git a/tools/database/overrides.go b/tools/database/overrides.go
index c255804c20..4a571a2b2c 100644
--- a/tools/database/overrides.go
+++ b/tools/database/overrides.go
@@ -474,8 +474,8 @@ var SharedSpellsIcons = []int32{
 	54648,
 
 	// Raid Debuffs
-	7386,
 	8647,
+	47467,
 	55754,
 
 	770,
diff --git a/ui/core/components/icon_inputs.ts b/ui/core/components/icon_inputs.ts
index 562f55ebcb..9873895a7a 100644
--- a/ui/core/components/icon_inputs.ts
+++ b/ui/core/components/icon_inputs.ts
@@ -183,7 +183,7 @@ export const RevitalizeWildGrowth = makeMultistateMultiplierIndividualBuffInput(
 // Debuffs
 
 export const MajorArmorDebuff = InputHelpers.makeMultiIconInput([
-	makeBooleanDebuffInput(ActionId.fromSpellId(7386), 'sunderArmor'),
+	makeBooleanDebuffInput(ActionId.fromSpellId(47467), 'sunderArmor'),
 	makeBooleanDebuffInput(ActionId.fromSpellId(8647), 'exposeArmor'),
 	makeBooleanDebuffInput(ActionId.fromSpellId(55754), 'acidSpit'),
 ], 'Major ArP');
diff --git a/ui/raid/raid_stats.ts b/ui/raid/raid_stats.ts
index 4b7b1a4689..37ae31ec46 100644
--- a/ui/raid/raid_stats.ts
+++ b/ui/raid/raid_stats.ts
@@ -817,7 +817,7 @@ const RAID_STATS_OPTIONS: RaidStatsOptions = {sections: [
 				effects: [
 					{
 						label: 'Sunder Armor',
-						actionId: ActionId.fromSpellId(7386),
+						actionId: ActionId.fromSpellId(47467),
 						playerData: playerClass(Class.ClassWarrior, player => player.isSpec(Spec.SpecProtectionWarrior) || (player as Player<Spec.SpecWarrior>).getRotation().sunderArmor == SunderArmor.SunderArmorMaintain),
 					},
 					{