0.35 interface updates

spazzo966 · Nov 19, 2023 · 75152d5 · 75152d5
1 parent 4c98b37
commit 75152d5
Show file tree

Hide file tree

Showing 7 changed files with 952 additions and 891 deletions.
diff --git a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/FontStyles.StormStyle b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/FontStyles.StormStyle
@@ -22,7 +22,8 @@
   <Style name="Spazzo_TopPanelDeathLabel" template="DeathTimerLabel" height="25" vjustify="Middle" hjustify="Center" />
   <Style name="Spazzo_TopPanelDeathLabelWide" template="Spazzo_TopPanelDeathLabel" height="30" />
   <Style name="Spazzo_TopPanelDeathLabelCompact" template="Spazzo_TopPanelDeathLabel" height="22" />
-  <Style name="Spazzo_TopPanelVikingDeathLabel" template="Spazzo_TopPanelDeathLabel" height="14" hjustify="Left" />
+  <Style name="Spazzo_TopPanelVikingDeathLabel" template="Spazzo_TopPanelDeathLabel" height="15" hjustify="Left" />
+  <Style name="Spazzo_TopPanelVikingDeathLabelUltrawide" template="Spazzo_TopPanelVikingDeathLabel" vjustify="Top" />
   <Style name="Spazzo_TopPanelAbilCooldownLabel" template="Storm_AbilityTopBar_Modified" height="12" />
   <Style name="Spazzo_TopPanelAbilCooldownLabel_Heroic" template="Storm_AbilityTopBar_Modified" height="18" />
   <Style name="Spazzo_TopPanelAbilCooldownLabel_Debug" template="Spazzo_TopPanelAbilCooldownLabel_Heroic" height="8" />

diff --git a/...ce/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/CustomPanelSpazzo.StormLayout b/...ce/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/CustomPanelSpazzo.StormLayout
diff --git a/...e/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBar.StormLayout b/...e/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBar.StormLayout
diff --git a/...coreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarAbilities.StormLayout b/...coreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarAbilities.StormLayout
@@ -3526,7 +3526,7 @@
       </State>
       <State name="HeroGarroshSeasonedSoldier">
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroGarrosh"/>
-        <When type="Property" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon6/IconImage" texture="Assets\Textures\storm_ui_icon_garrosh_armor_up.dds"/>
+        <When type="Property" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon6/IconImage" texture="Assets\Textures\storm_ui_icon_garrosh_bloodthirst.dds"/>
         <When type="StateGroup" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon6/IconImage" TextureState="TierSelected" />
         <Action type="SetProperty" frame="HeroAbil2/UnitAbilCharge" Visible="True" />
         <Action type="SetProperty" frame="HeroAbil2/UnitAbilCharge" AbilityLink="GarroshBloodthirst" />
@@ -4294,7 +4294,7 @@
       </State>
       <State name="DiabloHasSoulShieldTalent">
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroDiablo"/>
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_talent_spellshield.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_Talent_HardenedShield.dds"/>
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" TextureState="TierSelected" />
         <When type="Property" frame="$this/T1ControllerFrame" Visible="True"/>
         <Action type="SetProperty" frame="LabelT1" Text="SoulShield" />
@@ -4482,7 +4482,7 @@
         <Action type="SetProperty" frame="HeroActiveAbilT1/UnitAbilFrame" AbilityLink="TyrandeTrueshotAura" />
       </State>
       <State name="SgtHammerMaelstromRounds">
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_sgthammer_siegemode_var1.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_sgthammer_siegemode_var2.dds"/>
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" TextureState="TierSelected" />
         <When type="Property" frame="$this/T1ControllerFrame" Visible="True"/>
         <Action type="SetProperty" frame="LabelT1" Text="SgtHammerSiegeModeMaelstromRounds" />
@@ -7643,21 +7643,6 @@
           </Frame>
         </Frame>
       </Frame>
-      <Frame type="UnitStatusAbilIcon" name="UnitAbilFrameBackup" template="SpazzoCustomTopBarAbilities/AbilityTopBarTalentContainerTemplate/UnitAbilFrame">
-        <AbilityLink val="NULL" />
-        <Frame type="AbilIcon" name="AbilIcon">
-          <Frame type="Image" name="IconImage">
-            <Alpha val="0" />
-            <Visible val="false" />
-            <Unclipped val="false"/>
-          </Frame>
-          <Frame type="Label" name="CooldownLabel">
-            <StateGroup name="LabelStateGroup">
-              <DefaultState val="Heroic" />
-            </StateGroup>
-          </Frame>
-        </Frame>
-      </Frame>
       <Frame type="UnitStatusAbilCharge" name="AbilityCharge">
         <Frame type="Label" name="ChargesLabel">
           <StateGroup name="LabelStateGroup">

diff --git a/...omScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarQuests.StormLayout b/...omScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarQuests.StormLayout
@@ -771,6 +771,19 @@
         <Action type="SetProperty" frame="$this/TalentTreeBorder/IconBorderImage" Visible="False" /> 
         <Action type="SetState" frame="$this" Group="BaselineType" State="HasNone"/>
       </State>
+      <State name="RexxarDummyState">
+        <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroRexxar"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$Talent0MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <Action type="SetProperty" frame="$this/UnitAbilFrame" AbilityLink="NULL" />
+        <Action type="SetProperty" frame="$this/UnitStatusBehaviorIconBaselineQuest" Behavior="NULL" />
+        <Action type="SetProperty" frame="$this/UnitChargeFrame" AbilityLink="NULL" />
+        <Action type="SetProperty" frame="$this/UnitChargeFrame" ChargeLink="NULL" />
+        <Action type="SetProperty" frame="$this/UnitChargeFrame" ChargeLocation="Unit" /> 
+        <Action type="SetProperty" frame="$this/TalentTreeBorder" Visible="False" /> 
+        <Action type="SetProperty" frame="$this/TalentTreeBorder/IconBorderImage" Visible="False" /> 
+        <Action type="SetState" frame="$this" Group="BaselineType" State="HasNone"/>
+      </State>
       <State name="DeathwingHeroicAvailableForChoice">
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroDeathwing"/>
         <When type="Property" frame="$Talent0MasterSetting/ShowActives/CheckBoxButton" Toggled="True"/>
@@ -2458,6 +2471,17 @@
         <Action type="SetProperty" frame="$parent/BuffDurationT1" Behavior="JunkratConcussionMineBlowEmUpBonusDamageBehavior" />
         <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
       </State>
+      <State name="DwarfBlock">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" Unit="HeroMuradin"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_Muradin_Dwarftoss.dds"/>
+        <When type="Property" frame="$ancestor[@type=UnitStatusFrame]/T1QuestControllerFrame" Visible="False"/>
+        <When type="Property" frame="$Talent1MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT1" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT1" Behavior="TalentBucketBlock" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
       <State name="NoState">
         <Action type="SetProperty" frame="$parent/QuestStackCounterT1" Behavior="NULL" />
         <Action type="SetProperty" frame="$parent/QuestStackCounterT1" Visible="False" />
@@ -2842,6 +2866,20 @@
         <Action type="SetState" frame="$this" Group="UsesTokens" State="True"/>
         <Action type="ApplyTemplate" frame="$parent/VisiblityControllerFrame" template="SpazzoCustomTopBarQuests/VisibityControllerFrameDontHideAtCompletion"/>
       </State>
+      <State name="ReflexiveBlock">
+        <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" Unit="HeroIllidan"/>
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon2/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent2MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon2/IconImage" texture="Assets\Textures\storm_ui_icon_illidan_dive.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2" Behavior="TalentBucketBlock" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT2" Behavior="TalentBucketBlock" />
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackLabel" Style="Spazzo_TopPanelQuestLabel_NotQuest" /> 
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" AdjustmentColor="255,200,200,200" /> 
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" Alpha="130" /> 
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" ColorAdjustMode="Fill" /> 
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="True"/>
+      </State>
       <State name="NoState">
         <Action type="SetProperty" frame="$parent/QuestStackCounterT2" Behavior="NULL" />
         <Action type="SetProperty" frame="$parent/QuestStackCounterT2" Visible="False" />
@@ -2868,7 +2906,7 @@
       </State>
       <State name="MaelstromWeapon">
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon3/IconImage" TextureState="TierSelected"/>
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon3/IconImage" texture="Assets\Textures\storm_ui_icon_thrall_windfury_var1.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon3/IconImage" texture="Assets\Textures\storm_ui_icon_thrall_windfury.dds"/>
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]/T3QuestControllerFrame" Visible="True"/>
         <Action type="SetProperty" frame="$parent" Behavior="ThrallMaelstromWeaponTokenCounter" />
         <Action type="ApplyTemplate" frame="$parent/VisiblityControllerFrame" template="SpazzoCustomTopBarQuests/VisibityControllerFrameDontHideAtCompletion"/>
@@ -3718,7 +3756,7 @@
       <DefaultState val="NoState" />
       <State name="Zanshin">
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" TextureState="TierSelected"/>
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_genji_deflect_b.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_genji_deflect.dds"/>
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]/T7QuestControllerFrame" Visible="True"/>
         <Action type="SetProperty" frame="$parent" Behavior="GenjiDeflectZanshin" /> 
       </State> 
@@ -3738,7 +3776,7 @@
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" TextureState="TierSelected"/>
         <When type="Property" frame="$Talent7MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
         <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_malfurion_moonfire_a.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_malfurion_moonfire.dds"/>
         <Action type="SetProperty" frame="$parent" Behavior="MalfurionMoonfireLunarShowerTokenCounter" /> 
         <Action type="SetProperty" frame="$parent/BehaviorIcon/StackLabel" Style="Spazzo_TopPanelQuestLabel_NotQuest" /> 
         <Action type="SetProperty" frame="$parent/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" AdjustmentColor="255,200,200,200" />