v0.29a

Minor fixes, additions to Top Bar buffs, track Mechanical Know-How on Sgt. Hammer for it's bonus damage.
spazzo966 · May 10, 2022 · 32dfd6f · 32dfd6f
1 parent 3e6bcb1
commit 32dfd6f
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 24 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,27 @@
-# v0.29 (**2022-04-29**)
+# v0.29a
+
+* Statistics
+  * Sgt. Hammer now tracks the bonus damage from Mechanical Knowhow, split into Heroic targets and non-Heroic targets
+  * Fixed an issue where Alexstrasza's Cleansing Flame would not be counted correctly. Thanks, Dragonqueen Form
+  * Fixed an issue where Blaze's Adrenaline Stimpack casts would not be be in the correct location
+  * Fixed an issue where Diablo would display error text when Shadow Charge was interrupted before hitting an enemy
+
+* UI
+  * Top Bar
+    * Anub'arak's Locust Swarm remaining duration is now displayed as a buff if selected as a talent
+    * Chen's Wandering Keg remaining duration is now displayed as a buff if selected as a talent
+    * Diablo's Lightning Breath remaining duration is now displayed as a buff if selected as a talent
+    * D.Va's Bunny Hop remaining duration is now displayed as a buff if selected as a talent. This will be hidden when it is not decaying
+    * E.T.C.'s Mosh Pit remaining duration is now displayed as a buff if selected as a talent
+    * Blaze's Combustion channel timer is now displayed as a buff if selected as a talent, this will fill the duration indicator rather than empty it
+    * Gall's Twisting Nether channel timer is now displayed as a buff if selected as a talent, this will fill the duration indicator rather than empty it
+    * Imperius's Angelic Armaments reactivation delay is now displayed as a buff if selected as a talent, this will fill the duration indicator rather than empty it
+    * Dehaka's Adaption buff display will now fill the duration indicator, rather than empty it
+  * Bug Fixes
+    * Fixed an issue with Diablo's thirteenth score entry in the secondary hero-specific stat tab not referencing the correct string
+
+
+## v0.29 (**2022-04-29**)
 
 * Statistics
   * Updated Alterac Pass to the version added in build 87990

diff --git a/conversion/dragAll_details.bat b/conversion/dragAll_details.bat
@@ -12,7 +12,6 @@ echo extracting tracker events
 
 echo finding map name in tracker events
 
-
 findstr /c:"MapCursedHollow" "%mpqdirectory%\replay.tracker.events"
 if %ERRORLEVEL%==0 (
     echo string found cursed
@@ -191,7 +190,6 @@ if %ERRORLEVEL%==0 (
 	GOTO found
 )
 
-
 echo failed to discern battleground, please use the manual converter.
 
 del "%mpqdirectory%\replay.tracker.events"

diff --git a/...ce/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/CustomPanelSpazzo.StormLayout b/...ce/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/CustomPanelSpazzo.StormLayout
@@ -7766,6 +7766,7 @@
             <Action type="SetProperty" frame="$parent/$parent/PlayerScoreContainerFrameSupportTen/ScoreValueLabel/TooltipAnchorFrame" Tooltip="@UI/Spazzo/Diablo/TalentTwenty"/>
             <Action type="SetProperty" frame="$parent/$parent/PlayerScoreContainerFrameSupportEleven/ScoreValueLabel/TooltipAnchorFrame" Tooltip="@UI/Spazzo/Diablo/SupportEleven"/>
             <Action type="SetProperty" frame="$parent/$parent/PlayerScoreContainerFrameSupportTwelve/ScoreValueLabel/TooltipAnchorFrame" Tooltip="@UI/Spazzo/Diablo/SupportTwelve"/>
+            <Action type="SetProperty" frame="$parent/$parent/PlayerScoreContainerFrameSupportThirteen/ScoreValueLabel/TooltipAnchorFrame" Tooltip="@UI/Spazzo/Diablo/SupportThirteen"/>
           </State>
           <State name="DVA">
             <When type="Property" frame="$this" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_dva.dds"/>

diff --git a/...omScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarQuests.StormLayout b/...omScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarQuests.StormLayout
@@ -2731,6 +2731,109 @@
         <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="NULL" />
         <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
       </State>
+      <State name="AnubarakLocustSwarm">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_Anubarak_LocustSwarm.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="AnubarakLocustSwarmActive" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <State name="BlazeCombustion">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_blaze_combustion.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="FirebatCombustionChannel" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4/BehaviorIcon/CooldownBar" InvertFill="True" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <State name="StormEarthFire">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_chen_stormearthfire.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="StormEarthFireCasterBehavior" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <State name="WanderingKeg">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_chen_wanderingkeg.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="ChenWanderingKegArmorBuff" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <State name="LightningBreath">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_diablo_lightningbreath.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="DiabloLightningBreathController" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <State name="BunnyHop">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" Unit="HeroDVaMech"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_dva_bunnyhop.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="DVaBunnyHopDuration" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <State name="Moshpit">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_ETC_MoshPit.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="L90ETCMoshPitChannel" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <State name="AngelicArmaments">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_imperius_r1.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="ImperiusAngelicArmamentsShieldBehavior" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4/BehaviorIcon/CooldownBar" InvertFill="True" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <State name="TwistingNether">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_gall_twistingnether_a.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" eBehavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="GallTwistingNetherChannelingBehavior" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4/BehaviorIcon/CooldownBar" InvertFill="True" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <State name="LongboatRaid">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_lostvikings_longboatraid.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="LongboatRaidTimedLife" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
+      <!-- <State name="RavenousSpirit">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_Nazeebo_RavenousSpirit.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="WitchDoctorRavenousSpiritPersistent" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State> -->
       <State name="WrathoftheBerserker">
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
         <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
@@ -2778,15 +2881,6 @@
         <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="KerriganMaelstrom" />
         <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
       </State>
-      <State name="StormEarthFire">
-        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
-        <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_chen_stormearthfire.dds"/>
-        <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
-        <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="StormEarthFireCasterBehavior" />
-        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
-      </State>
       <State name="GoForTheThroat">
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" TextureState="TierSelected"/>
         <When type="Property" frame="$Talent4MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
@@ -2803,6 +2897,7 @@
         <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" texture="Assets\Textures\storm_ui_icon_dehaka_adaptation.dds"/>
         <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
         <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="DehakaAdaptationDamageTrackerBehavior" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4/BehaviorIcon/CooldownBar" InvertFill="True" />
         <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
       </State>
       <State name="Avatar">
@@ -2890,6 +2985,7 @@
         <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Behavior="NULL" />
         <Action type="SetProperty" frame="$parent/QuestStackCounterT4" Visible="False" />
         <Action type="SetProperty" frame="$parent/BuffDurationT4" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT4/BehaviorIcon/CooldownBar" InvertFill="False" />
         <Action type="SetProperty" frame="$parent/BuffDurationT4" Visible="False" />
         <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
       </State>

diff --git a/interface/CustomScoreboard.StormInterface/enus.StormData/LocalizedData/GameStrings.txt b/interface/CustomScoreboard.StormInterface/enus.StormData/LocalizedData/GameStrings.txt
@@ -1,4 +1,4 @@
-UI/Spazzo/UIVersion=v0.29
+UI/Spazzo/UIVersion=v0.29a
 UI/Spazzo/UIWARNING=WARNING
 UI/Spazzo/UIWARNINGTOOLTIP=Game is detected as having ended, statistics may be incorrect, please rewind to after the core is destroyed, but before these images become visible!
 
@@ -4610,8 +4610,8 @@ UI/SpazzoDamage/SgtHammer/ScoreSix=Concussive Blast Damage to Heroes
 UI/SpazzoDamage/SgtHammer/ScoreSeven=Concussive Blast Damage to non-Heroes
 UI/SpazzoDamage/SgtHammer/ScoreEight=Napalm Strike, BFG Damage to Heroes
 UI/SpazzoDamage/SgtHammer/ScoreNine=Napalm Strike, BFG Damage to non-Heroes
-UI/SpazzoDamage/SgtHammer/ScoreTen=Giant Killer Damage
-UI/SpazzoDamage/SgtHammer/ScoreEleven=Unused
+UI/SpazzoDamage/SgtHammer/ScoreTen=Mechanical Know-How Bonus Damage to Heroes, Giant Killer Damage
+UI/SpazzoDamage/SgtHammer/ScoreEleven=Mechanical Know-How Bonus Damage to non-Heroes
 UI/SpazzoDamage/SgtHammer/ScoreTwelve=Unused
 UI/SpazzoAccuracy/SgtHammer/ScoreOne=Spider Mine Casts
 UI/SpazzoAccuracy/SgtHammer/ScoreTwo=Concussive Blast Casts