Skip to content

Commit

Permalink
0.32
Browse files Browse the repository at this point in the history
Improved team score interface, minor optimisation, fixed help menu hotkey issue
  • Loading branch information
spazzo966 committed Jan 29, 2023
1 parent 11165d4 commit e695705
Show file tree
Hide file tree
Showing 10 changed files with 859 additions and 1,028 deletions.
16 changes: 15 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
# v0.31b (**2022-10-27**)
# v0.32 (**2023-01-29**)

* Statistics
* No changes, the version shipped has not been increased since the previous version

* UI
* The Team Name & Score options have now been separeted into two separate options - one for displaying a fixed location Team Name which is intended for use with external overlay software, and one for display an in-game score
* The in-game score can be clicked on the left of each team's score entry to decrease the value to a minimum of 0, and clicked on the right to increase the score to a maximum of 15, clicking to increase when at 15 reduces it to 0, and decreasing at 0 increases it to 15
* There is a third option to alter the location of the team score, by default it will position on the outside side of the Core Health for each team, and when toggled it will display on the inside side of the Core Health for each team.
* When the Core Health is not visible, the team score will position underneath the first player on each team's side, this location is identical to when it is set to display on the inside side of the Core Health
* Each of these new options features hotkeys, which are displayed in the Help Menu, which is accessible by pressing Alt+H
* Removed some redundant layout frames from the Top Bar, which should have a slight positive impact on performace
* Fixed an issue causing the first hotkey listed in the Help Menu on the left side to not display

## v0.31b (**2022-10-27**)

* Statistics
* No changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@
<Style name="Spazzo_HeroRolloutLabelPlayerNameChaos" template="Spazzo_HeroRolloutLabelPlayerName" hjustify="Right" />
<Style name="Spazzo_HeroRolloutLabelUnitNameChaos" template="Spazzo_HeroRolloutLabelUnitName" hjustify="Right" />
<Style name="SpazzoXPDebug" template="ExpandoLabel" height="12" hjustify="Center" vjustify="Middle" />
<Style name="SpazzoHelpHeader" template="HeaderExtendedTemplate" height="50" hjustify="Center" vjustify="Middle" />
<Style name="SpazzoHelpHeader" template="HeaderExtendedTemplate" height="46" hjustify="Center" vjustify="Middle" />
<Style name="SpazzoHelpShortcutListing" template="Storm_TabButton_Label_Modified" height="19" hjustify="Left" vjustify="Top" />
<Style name="SpazzoHelpShortcutListingRight" template="SpazzoHelpShortcutListing" hjustify="Right" />
<Style name="SpazzoHelpShortcutListingMiddle" template="SpazzoHelpShortcutListing" hjustify="Center" />
<Style name="Spazzo_TopBarTeamScore" template="Spazzo_TopPanelTalentLabel" height="30" textcolor="255,230,230,230" fontflags="Outline" styleflags="!Shadow|!Glow" outlinewidth="3" />

</StyleFile>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5400,4 +5400,258 @@
</Frame>
</Frame>


<Frame type="Frame" name="TopBarScoreTemplate">
<RenderPriority val="530" />
<Frame type="Button" name="IncreaseButton">
<Anchor side="Top" relative="$parent" pos="Min" offset="2"/>
<Anchor side="Bottom" relative="$parent" pos="Max" offset="-2"/>
<Anchor side="Left" relative="$parent" pos="Mid" offset="0"/>
<Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
<AllowedButtons val="Left"/>
</Frame>
<Frame type="Button" name="DecreaseButton">
<Anchor side="Top" relative="$parent" pos="Min" offset="2"/>
<Anchor side="Bottom" relative="$parent" pos="Max" offset="-2"/>
<Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
<Anchor side="Right" relative="$parent" pos="Mid" offset="0"/>
<AllowedButtons val="Left"/>
</Frame>
<Frame type="Frame" name="IncreaseMonitorFrame">
<Anchor relative="$parent"/>
<Visible val="False"/>
<Animation name="Pressed">
<Event event="OnClick" frame="$parent/IncreaseButton" action="Reset,Play" />
<Controller type="Visibility" end="Pause" frame="$this">
<Key type="Bool" time="0" value="True"/>
</Controller>
</Animation>
<Animation name="Autohide">
<Event event="Autohide" action="Reset,Play"/>
<Controller type="Visibility" end="Pause" frame="$this">
<Key type="Bool" time="0" value="False"/>
</Controller>
</Animation>
</Frame>
<Frame type="Frame" name="DecreaseMonitorFrame">
<Anchor relative="$parent"/>
<Visible val="False"/>
<Animation name="Pressed">
<Event event="OnClick" frame="$parent/DecreaseButton" action="Reset,Play" />
<Controller type="Visibility" end="Pause" frame="$this">
<Key type="Bool" time="0" value="True"/>
</Controller>
</Animation>
<Animation name="Autohide">
<Event event="Autohide" action="Reset,Play"/>
<Controller type="Visibility" end="Pause" frame="$this">
<Key type="Bool" time="0" value="False"/>
</Controller>
</Animation>
</Frame>
<Frame type="Label" name="ScoreEntryLabel">
<Anchor side="Top" relative="$parent" pos="Min" offset="2"/>
<Anchor side="Bottom" relative="$parent" pos="Max" offset="-2"/>
<Anchor side="Left" relative="$parent" pos="Min" offset="2"/>
<Anchor side="Right" relative="$parent" pos="Max" offset="-2"/>
<Text val="0"/>
<Style val="Spazzo_TopBarTeamScore" />
<Options val="ScaleToPreventTruncation" />
<StateGroup name="NumberController">
<State name="SetTo1FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="0"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="1" undo="False"/>
</State>
<State name="SetTo2FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="1"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="2" undo="False"/>
</State>
<State name="SetTo3FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="2"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="3" undo="False"/>
</State>
<State name="SetTo4FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="3"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="4" undo="False"/>
</State>
<State name="SetTo5FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="4"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="5" undo="False"/>
</State>
<State name="SetTo6FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="5"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="6" undo="False"/>
</State>
<State name="SetTo7FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="6"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="7" undo="False"/>
</State>
<State name="SetTo8FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="7"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="8" undo="False"/>
</State>
<State name="SetTo9FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="8"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="9" undo="False"/>
</State>
<State name="SetTo10FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="9"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="10" undo="False"/>
</State>
<State name="SetTo11FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="10"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="11" undo="False"/>
</State>
<State name="SetTo12FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="11"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="12" undo="False"/>
</State>
<State name="SetTo13FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="12"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="13" undo="False"/>
</State>
<State name="SetTo14FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="13"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="14" undo="False"/>
</State>
<State name="SetTo15FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="14"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="15" undo="False"/>
</State>
<State name="SetTo0FromInc">
<When type="Property" frame="$parent/IncreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="15"/>
<Action type="SendEvent" frame="$parent/IncreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="0" undo="False"/>
</State>
<State name="SetTo15FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="0"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="15" undo="False"/>
</State>
<State name="SetTo14FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="15"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="14" undo="False"/>
</State>
<State name="SetTo13FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="14"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="13" undo="False"/>
</State>
<State name="SetTo12FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="13"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="12" undo="False"/>
</State>
<State name="SetTo11FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="12"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="11" undo="False"/>
</State>
<State name="SetTo10FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="11"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="10" undo="False"/>
</State>
<State name="SetTo9FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="10"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="9" undo="False"/>
</State>
<State name="SetTo8FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="9"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="8" undo="False"/>
</State>
<State name="SetTo7FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="8"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="7" undo="False"/>
</State>
<State name="SetTo6FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="7"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="6" undo="False"/>
</State>
<State name="SetTo5FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="6"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="5" undo="False"/>
</State>
<State name="SetTo4FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="5"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="4" undo="False"/>
</State>
<State name="SetTo3FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="4"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="3" undo="False"/>
</State>
<State name="SetTo2FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="3"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="2" undo="False"/>
</State>
<State name="SetTo1FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="2"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="1" undo="False"/>
</State>
<State name="SetTo0FromDec">
<When type="Property" frame="$parent/DecreaseMonitorFrame" Visible="True"/>
<When type="Property" frame="$this" Text="1"/>
<Action type="SendEvent" frame="$parent/DecreaseMonitorFrame" event="Autohide"/>
<Action type="SetProperty" frame="$this" Text="0" undo="False"/>
</State>
</StateGroup>
</Frame>
</Frame>

</Desc>
Binary file not shown.
Binary file not shown.
7 changes: 7 additions & 0 deletions interface/CustomScoreboard.StormInterface/_Config.StormLayout
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
<Constant name="TopBarTeamBorderSliderValue" val="255" />
<Constant name="TopBarShowHeroes" val="true" />
<Constant name="TopBarShowTeamNames" val="false" />
<Constant name="TopBarShowTeamScores" val="false" />
<Constant name="TopBarInsideTeamNameScore" val="false" />
<Constant name="TopBarProxyTalents" val="true" />
<Constant name="DisplayObjWarning" val="true" />
<Constant name="DisplayAbilBackings" val="true" />
Expand Down Expand Up @@ -364,6 +366,11 @@
description = "Set to true to display a section of the UI for team names. Team names must be managed through external overlay software",
type = "Boolean"
) -->
<!-- @Setting ( constant = "TopBarShowTeamScores",
default = "false",
description = "Set to true to display a section of the UI for team scores.",
type = "Boolean"
) -->
<!-- @Setting ( constant = "TopBarProxyTalents",
default = "true",
description = "Set to false to cause hero talents to not cascade to an earlier tier's slot in the custom Top Bar when talents are set to have custom visibility rules",
Expand Down
Loading

0 comments on commit e695705

Please sign in to comment.