Skip to content

Commit 75152d5

Browse files
spazzo966spazzo966
committed
0.35 interface updates
1 parent 4c98b37 commit 75152d5

File tree

7 files changed

+952
-891
lines changed

7 files changed

+952
-891
lines changed

‎interface/CustomScoreboard.StormInterface/Base.StormData/UI/FontStyles.StormStyle

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
<Style name="Spazzo_TopPanelDeathLabel" template="DeathTimerLabel" height="25" vjustify="Middle" hjustify="Center" />
2323
<Style name="Spazzo_TopPanelDeathLabelWide" template="Spazzo_TopPanelDeathLabel" height="30" />
2424
<Style name="Spazzo_TopPanelDeathLabelCompact" template="Spazzo_TopPanelDeathLabel" height="22" />
25-
<Style name="Spazzo_TopPanelVikingDeathLabel" template="Spazzo_TopPanelDeathLabel" height="14" hjustify="Left" />
25+
<Style name="Spazzo_TopPanelVikingDeathLabel" template="Spazzo_TopPanelDeathLabel" height="15" hjustify="Left" />
26+
<Style name="Spazzo_TopPanelVikingDeathLabelUltrawide" template="Spazzo_TopPanelVikingDeathLabel" vjustify="Top" />
2627
<Style name="Spazzo_TopPanelAbilCooldownLabel" template="Storm_AbilityTopBar_Modified" height="12" />
2728
<Style name="Spazzo_TopPanelAbilCooldownLabel_Heroic" template="Storm_AbilityTopBar_Modified" height="18" />
2829
<Style name="Spazzo_TopPanelAbilCooldownLabel_Debug" template="Spazzo_TopPanelAbilCooldownLabel_Heroic" height="8" />

‎interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/CustomPanelSpazzo.StormLayout

+96-140
Large diffs are not rendered by default.

‎interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBar.StormLayout

+62-553
Large diffs are not rendered by default.

‎interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarAbilities.StormLayout

+3-18
Original file line numberDiff line numberDiff line change
@@ -3526,7 +3526,7 @@
35263526
</State>
35273527
<State name="HeroGarroshSeasonedSoldier">
35283528
<When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroGarrosh"/>
3529-
<When type="Property" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon6/IconImage" texture="Assets\Textures\storm_ui_icon_garrosh_armor_up.dds"/>
3529+
<When type="Property" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon6/IconImage" texture="Assets\Textures\storm_ui_icon_garrosh_bloodthirst.dds"/>
35303530
<When type="StateGroup" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon6/IconImage" TextureState="TierSelected" />
35313531
<Action type="SetProperty" frame="HeroAbil2/UnitAbilCharge" Visible="True" />
35323532
<Action type="SetProperty" frame="HeroAbil2/UnitAbilCharge" AbilityLink="GarroshBloodthirst" />
@@ -4294,7 +4294,7 @@
42944294
</State>
42954295
<State name="DiabloHasSoulShieldTalent">
42964296
<When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroDiablo"/>
4297-
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_talent_spellshield.dds"/>
4297+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_Talent_HardenedShield.dds"/>
42984298
<When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" TextureState="TierSelected" />
42994299
<When type="Property" frame="$this/T1ControllerFrame" Visible="True"/>
43004300
<Action type="SetProperty" frame="LabelT1" Text="SoulShield" />
@@ -4482,7 +4482,7 @@
44824482
<Action type="SetProperty" frame="HeroActiveAbilT1/UnitAbilFrame" AbilityLink="TyrandeTrueshotAura" />
44834483
</State>
44844484
<State name="SgtHammerMaelstromRounds">
4485-
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_sgthammer_siegemode_var1.dds"/>
4485+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_sgthammer_siegemode_var2.dds"/>
44864486
<When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" TextureState="TierSelected" />
44874487
<When type="Property" frame="$this/T1ControllerFrame" Visible="True"/>
44884488
<Action type="SetProperty" frame="LabelT1" Text="SgtHammerSiegeModeMaelstromRounds" />
@@ -7643,21 +7643,6 @@
76437643
</Frame>
76447644
</Frame>
76457645
</Frame>
7646-
<Frame type="UnitStatusAbilIcon" name="UnitAbilFrameBackup" template="SpazzoCustomTopBarAbilities/AbilityTopBarTalentContainerTemplate/UnitAbilFrame">
7647-
<AbilityLink val="NULL" />
7648-
<Frame type="AbilIcon" name="AbilIcon">
7649-
<Frame type="Image" name="IconImage">
7650-
<Alpha val="0" />
7651-
<Visible val="false" />
7652-
<Unclipped val="false"/>
7653-
</Frame>
7654-
<Frame type="Label" name="CooldownLabel">
7655-
<StateGroup name="LabelStateGroup">
7656-
<DefaultState val="Heroic" />
7657-
</StateGroup>
7658-
</Frame>
7659-
</Frame>
7660-
</Frame>
76617646
<Frame type="UnitStatusAbilCharge" name="AbilityCharge">
76627647
<Frame type="Label" name="ChargesLabel">
76637648
<StateGroup name="LabelStateGroup">

‎interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarQuests.StormLayout

+41-3
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,19 @@
771771
<Action type="SetProperty" frame="$this/TalentTreeBorder/IconBorderImage" Visible="False" />
772772
<Action type="SetState" frame="$this" Group="BaselineType" State="HasNone"/>
773773
</State>
774+
<State name="RexxarDummyState">
775+
<When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroRexxar"/>
776+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
777+
<When type="Property" frame="$Talent0MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
778+
<Action type="SetProperty" frame="$this/UnitAbilFrame" AbilityLink="NULL" />
779+
<Action type="SetProperty" frame="$this/UnitStatusBehaviorIconBaselineQuest" Behavior="NULL" />
780+
<Action type="SetProperty" frame="$this/UnitChargeFrame" AbilityLink="NULL" />
781+
<Action type="SetProperty" frame="$this/UnitChargeFrame" ChargeLink="NULL" />
782+
<Action type="SetProperty" frame="$this/UnitChargeFrame" ChargeLocation="Unit" />
783+
<Action type="SetProperty" frame="$this/TalentTreeBorder" Visible="False" />
784+
<Action type="SetProperty" frame="$this/TalentTreeBorder/IconBorderImage" Visible="False" />
785+
<Action type="SetState" frame="$this" Group="BaselineType" State="HasNone"/>
786+
</State>
774787
<State name="DeathwingHeroicAvailableForChoice">
775788
<When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroDeathwing"/>
776789
<When type="Property" frame="$Talent0MasterSetting/ShowActives/CheckBoxButton" Toggled="True"/>
@@ -2458,6 +2471,17 @@
24582471
<Action type="SetProperty" frame="$parent/BuffDurationT1" Behavior="JunkratConcussionMineBlowEmUpBonusDamageBehavior" />
24592472
<Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
24602473
</State>
2474+
<State name="DwarfBlock">
2475+
<When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" TextureState="TierSelected"/>
2476+
<When type="Property" frame="$ancestor[@type=UnitStatusFrame]" Unit="HeroMuradin"/>
2477+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_Muradin_Dwarftoss.dds"/>
2478+
<When type="Property" frame="$ancestor[@type=UnitStatusFrame]/T1QuestControllerFrame" Visible="False"/>
2479+
<When type="Property" frame="$Talent1MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
2480+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
2481+
<Action type="SetProperty" frame="$parent/QuestStackCounterT1" Behavior="NULL" />
2482+
<Action type="SetProperty" frame="$parent/BuffDurationT1" Behavior="TalentBucketBlock" />
2483+
<Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
2484+
</State>
24612485
<State name="NoState">
24622486
<Action type="SetProperty" frame="$parent/QuestStackCounterT1" Behavior="NULL" />
24632487
<Action type="SetProperty" frame="$parent/QuestStackCounterT1" Visible="False" />
@@ -2842,6 +2866,20 @@
28422866
<Action type="SetState" frame="$this" Group="UsesTokens" State="True"/>
28432867
<Action type="ApplyTemplate" frame="$parent/VisiblityControllerFrame" template="SpazzoCustomTopBarQuests/VisibityControllerFrameDontHideAtCompletion"/>
28442868
</State>
2869+
<State name="ReflexiveBlock">
2870+
<When type="Property" frame="$ancestor[@type=UnitStatusFrame]" Unit="HeroIllidan"/>
2871+
<When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon2/IconImage" TextureState="TierSelected"/>
2872+
<When type="Property" frame="$Talent2MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
2873+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
2874+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon2/IconImage" texture="Assets\Textures\storm_ui_icon_illidan_dive.dds"/>
2875+
<Action type="SetProperty" frame="$parent/QuestStackCounterT2" Behavior="TalentBucketBlock" />
2876+
<Action type="SetProperty" frame="$parent/BuffDurationT2" Behavior="TalentBucketBlock" />
2877+
<Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackLabel" Style="Spazzo_TopPanelQuestLabel_NotQuest" />
2878+
<Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" AdjustmentColor="255,200,200,200" />
2879+
<Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" Alpha="130" />
2880+
<Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" ColorAdjustMode="Fill" />
2881+
<Action type="SetState" frame="$this" Group="UsesTokens" State="True"/>
2882+
</State>
28452883
<State name="NoState">
28462884
<Action type="SetProperty" frame="$parent/QuestStackCounterT2" Behavior="NULL" />
28472885
<Action type="SetProperty" frame="$parent/QuestStackCounterT2" Visible="False" />
@@ -2868,7 +2906,7 @@
28682906
</State>
28692907
<State name="MaelstromWeapon">
28702908
<When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon3/IconImage" TextureState="TierSelected"/>
2871-
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon3/IconImage" texture="Assets\Textures\storm_ui_icon_thrall_windfury_var1.dds"/>
2909+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon3/IconImage" texture="Assets\Textures\storm_ui_icon_thrall_windfury.dds"/>
28722910
<When type="Property" frame="$ancestor[@type=UnitStatusFrame]/T3QuestControllerFrame" Visible="True"/>
28732911
<Action type="SetProperty" frame="$parent" Behavior="ThrallMaelstromWeaponTokenCounter" />
28742912
<Action type="ApplyTemplate" frame="$parent/VisiblityControllerFrame" template="SpazzoCustomTopBarQuests/VisibityControllerFrameDontHideAtCompletion"/>
@@ -3718,7 +3756,7 @@
37183756
<DefaultState val="NoState" />
37193757
<State name="Zanshin">
37203758
<When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" TextureState="TierSelected"/>
3721-
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_genji_deflect_b.dds"/>
3759+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_genji_deflect.dds"/>
37223760
<When type="Property" frame="$ancestor[@type=UnitStatusFrame]/T7QuestControllerFrame" Visible="True"/>
37233761
<Action type="SetProperty" frame="$parent" Behavior="GenjiDeflectZanshin" />
37243762
</State>
@@ -3738,7 +3776,7 @@
37383776
<When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" TextureState="TierSelected"/>
37393777
<When type="Property" frame="$Talent7MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
37403778
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
3741-
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_malfurion_moonfire_a.dds"/>
3779+
<When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_malfurion_moonfire.dds"/>
37423780
<Action type="SetProperty" frame="$parent" Behavior="MalfurionMoonfireLunarShowerTokenCounter" />
37433781
<Action type="SetProperty" frame="$parent/BehaviorIcon/StackLabel" Style="Spazzo_TopPanelQuestLabel_NotQuest" />
37443782
<Action type="SetProperty" frame="$parent/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" AdjustmentColor="255,200,200,200" />

0 commit comments

Comments
 (0)