SC2 5.0.13.92028

SC2Mapster · Mar 27, 2024 · 07008cc · 07008cc
1 parent c06b7f0
commit 07008cc
Show file tree

Hide file tree

Showing 31 changed files with 587 additions and 1,284 deletions.
diff --git a/mods/core.sc2mod/base.sc2data/BuildId.txt b/mods/core.sc2mod/base.sc2data/BuildId.txt
@@ -1 +1 @@
-B91115
+B92028
diff --git a/mods/core.sc2mod/base.sc2data/DataBuildId.txt b/mods/core.sc2mod/base.sc2data/DataBuildId.txt
@@ -1 +1 @@
-B91115
+B92028
diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapInfoPanel.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapInfoPanel.SC2Layout
@@ -159,6 +159,8 @@
             <Anchor side="Right" relative="$parent" pos="Max" offset="-17"/>
             <Style val="@CustomGames_MapInfoPreview_Title"/>
             <Visible val="False"/>
+            <AcceptsMouseTooltip val="true"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
             <Text val="{$parent/BattleMapFrame/@NameWithVersion}"/>
         </Frame>
 

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapInfoTooltip.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapInfoTooltip.SC2Layout
@@ -39,6 +39,8 @@
             <Anchor side="Right" relative="$parent" pos="Max" offset="-20"/>
             <Style val="@Arcade_GameInfo_Title"/>
             <Visible val="False"/>
+            <AcceptsMouseTooltip val="true"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
             <Text val="{$parent/BattleMapFrame/@NameWithVersion}"/>
         </Frame>
 

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapProfileReviewsPanel.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapProfileReviewsPanel.SC2Layout
@@ -129,7 +129,7 @@
             <Anchor side="Right" relative="$parent/AnchorFrame" pos="Max" offset="-15"/>
             <Style val="@Arcade_GameInfo_HowToPlay_Desc"/>
             <AutoSizeClamps minHeight="40"/>
-            <Options val="NewLineIfTruncated"/>
+            <Options val="NewLineIfTruncated | IgnoreWrapHints | IgnoreHyperlinks | IgnoreHotkeys | IgnoreImages | IgnoreData | IgnoreInfo | IgnoreSpaceTags | IgnoreKeys"/>
         </Frame>
 
         <Frame type="Label" name="TimeLabel">

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/CustomGameModListPanel.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/CustomGameModListPanel.SC2Layout
@@ -142,7 +142,7 @@
             <AutoSizeClamps maxWidth="700"/>
             <Style val="@Arcade_ListTitle_Normal"/>
             <AcceptsMouseTooltip val="true"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
             <Animation name="SelectedLabel" template="CustomGameModListPanel/SelectedLabelTemplate"/>
         </Frame>
 
@@ -286,7 +286,7 @@
             <Anchor side="Top" relative="$parent/TitleLabel" pos="Max" offset="55"/>
             <Anchor side="Left" relative="$parent/JoinListBG" pos="Min" offset="10"/>
             <Anchor side="Right" relative="$parent/JoinListBG" pos="Mid" offset="0"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
             <AcceptsMouseTooltip val="true"/>
             <Style val="@Arcade_GameInfo_Title"/>
             <Text val="{$this/BattleMapFrame/@Name}"/>

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/CustomGamesLobbies.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/CustomGamesLobbies.SC2Layout
@@ -326,7 +326,9 @@
             <Anchor side="Right" relative="$parent/TitleLabel" pos="Min" offset="-20"/>
             <Height val="20"/>
             <AcceptsMouseTooltip val="True"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <!-- Can't ignore all FormatTags in here, due to use of FormattedMapName to assemble "map_name + mod_name" by the use of embedded style tag -->
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreWrapHints | IgnoreHyperlinks | IgnoreHotkeys | IgnoreImages | IgnoreData | IgnoreInfo | IgnoreSpaceTags | IgnoreKeys"/>
+            <TooltipFrame val="LobbyItemLabelTooltip"/>
 
             <Frame type="TextFormatFrame" name="FormattedMapName">
                 <Anchor relative="$parent"/>
@@ -469,7 +471,8 @@
             <Style val="@CustomGames_ListItem_Normal"/>
             <Text val="{$parent/@LobbyName}"/>
             <AcceptsMouseTooltip val="True"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
+            <TooltipFrame val="LobbyItemLabelTooltip"/>
 
             <StateGroup name="VisibleState">
                 <DefaultState val="NotVisible"/>
@@ -728,6 +731,8 @@
             <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
             <AcceptsMouse val="true"/>
             <RequireSelection val="true"/>
+
+            <Frame type="StandardTooltip" name="LobbyItemLabelTooltip" template="CustomGamesTemplates/BattleUserInputTooltip"/>
 
             <Frame type="LobbyTileListItem" name="Item0" template="CustomGamesLobbies/LobbyListItemTemplate">
                 <Frame type="Frame" name="AnchorFrame">

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/CustomGamesTemplates.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/CustomGamesTemplates.SC2Layout
@@ -168,8 +168,33 @@
             </Controller>
         </Animation>
     </Frame>
-
-
+
+
+    <!-- 
+    ========================
+    BATTLEUSERINPUTTOOLTIP
+    ========================
+    -->
+    <Frame type="StandardTooltip" name="BattleUserInputTooltip" template="StandardTooltip/StandardTooltip">
+        <Frame type="Label" name="Label">
+            <Options val="StripFormatTags | NewLineIfTruncated"/>
+        </Frame>
+
+        <StateGroup name="VisibilityState">
+            <DefaultState val="Invisible"/>
+
+            <State name="Visible">
+                <When type="Property" frame="$this/Label" operator="NotEqual" Text=""/>
+            </State>
+
+            <State name="Invisible">
+                <Action type="SetProperty" frame="$this/BackgroundImage" Visible="False"/>
+                <Action type="SetProperty" frame="$this/Label" Alpha="0"/>
+            </State>
+        </StateGroup>
+    </Frame>
+
+
     <!-- 
     ========================
     BATTLEMAPINFOPANEL
@@ -200,7 +225,7 @@
             <Style val="@CustomGames_MapInfoPreview_Title"/>
             <Text val="{$parent/BattleMapFrame/@Name}"/>
             <AcceptsMouse val="True"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <Options val="NewLineIfTruncated | IgnoreFormatTags"/>
 
             <StateGroup name="VisibleState">
                 <DefaultState val="NotVisible"/>
@@ -1260,6 +1285,8 @@
     -->
     <Frame type="BookmarkSelectionTileListItem" name="BookmarkSelectionTileListItemTemplate" template="StandardTileListTemplates/StandardSmallTileListItemTemplate">
         <HideWhenCleared val="False"/>
+
+        <Frame type="StandardTooltip" name="LobbyItemLabelTooltip" template="CustomGamesTemplates/BattleUserInputTooltip"/>
 
         <Frame type="Frame" name="AnchorFrame">
             <Anchor side="Left" relative="$parent/$parent" pos="Min" offset="16"/>
@@ -1364,6 +1391,9 @@
             <Anchor side="Left" relative="$parent/BattleMapIcon" pos="Max" offset="10"/>
             <Anchor side="Right" relative="$parent/BookmarkIcon" pos="Min" offset="-10"/>
             <Height val="22"/>
+            <!-- Can't ignore all FormatTags in here, due to use of FormattedMapName to assemble "map_name + mod_name" by the use of embedded style tag -->
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreWrapHints | IgnoreHyperlinks | IgnoreHotkeys | IgnoreImages | IgnoreData | IgnoreInfo | IgnoreSpaceTags | IgnoreKeys"/>
+            <TooltipFrame val="LobbyItemLabelTooltip"/>
 
             <Frame type="TextFormatFrame" name="FormattedMapName">
                 <Anchor relative="$parent"/>
@@ -2468,6 +2498,9 @@
             <Anchor side="Right" relative="$parent/TitleLabel" pos="Min" offset="-10"/>
             <Height val="22"/>
             <Style val="@CustomGames_ListItem_Normal"/>
+            <!-- Can't ignore all FormatTags in here, due to use of FormattedMapName to assemble "map_name + mod_name" by the use of embedded style tag -->
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreWrapHints | IgnoreHyperlinks | IgnoreHotkeys | IgnoreImages | IgnoreData | IgnoreInfo | IgnoreSpaceTags | IgnoreKeys"/>
+            <TooltipFrame val="LobbyItemLabelTooltip"/>
 
             <Frame type="TextFormatFrame" name="FormattedMapName">
                 <Anchor relative="$parent"/>

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/LobbyGameInfoFrame.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/LobbyGameInfoFrame.SC2Layout
@@ -122,7 +122,7 @@
             <Anchor side="Top" relative="$parent/ScreenshotTileList" pos="Max" offset="10"/>
             <Anchor side="Left" relative="$parent/ScreenshotTileList" pos="Min" offset="0"/>
             <Anchor side="Right" relative="$parent/ScreenshotTileList" pos="Max" offset="0"/>
-            <Options val="Ellipsis | TooltipIfTruncated"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
             <AcceptsMouse val="True"/>
             <Height val="30"/>
         </Frame>
@@ -133,7 +133,7 @@
             <Anchor side="Right" relative="$parent/ScreenshotTileList" pos="Max" offset="0"/>
             <Height val="30"/>
             <AcceptsMouse val="True"/>
-            <Options val="Ellipsis | TooltipIfTruncated"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
             <Style val="@Lobby_MapInfoPreview_Title"/>
             <Text val="{$parent/BattleMapFrame/@Name}"/>
         </Frame>

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/LobbyListTemplates.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/LobbyListTemplates.SC2Layout
@@ -193,7 +193,9 @@
             <Anchor side="Right" relative="$parent/TitleLabel" pos="Min" offset="-20"/>
             <Height val="20"/>
             <AcceptsMouseTooltip val="True"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <!-- Can't ignore all FormatTags in here, due to use of FormattedMapName to assemble "map_name + mod_name" by the use of embedded style tag -->
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreWrapHints | IgnoreHyperlinks | IgnoreHotkeys | IgnoreImages | IgnoreData | IgnoreInfo | IgnoreSpaceTags | IgnoreKeys"/>
+            <TooltipFrame val="MapLobbyItemLabelTooltip"/>
 
             <Frame type="TextFormatFrame" name="FormattedMapName">
                 <Anchor relative="$parent"/>
@@ -259,6 +261,8 @@
             <Height val="20"/>
             <Style val="@CustomGames_ListItem_Normal"/>
             <Text val="{$parent/@LobbyName}"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
+            <TooltipFrame val="MapLobbyItemLabelTooltip"/>
 
             <StateGroup name="StyleState">
 
@@ -499,6 +503,8 @@
         <AcceptsMouse val="true"/>
         <RequireSelection val="true"/>
 
+        <Frame type="StandardTooltip" name="MapLobbyItemLabelTooltip" template="CustomGamesTemplates/BattleUserInputTooltip"/>
+
         <Frame type="Label" name="MapNameHeaderLabel">
             <Anchor side="Top" relative="$parent" pos="Min" offset="22"/>
             <Anchor side="Left" relative="$parent" pos="Min" offset="17"/>

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/ReportDialogs.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/ReportDialogs.SC2Layout
@@ -35,6 +35,7 @@
         <Frame type="Label" name="TitleLabel">
             <Anchor side="Top" relative="$parent/DialogTitleLabel" pos="Max" offset="5"/>
             <Style val="@Arcade_ReportDialog_SubTitle"/>
+            <Options val="IgnoreFormatTags"/>
         </Frame>
 
         <Frame type="Label" name="DescriptionLabel">

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/ScreenBattleLobby.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/ScreenBattleLobby.SC2Layout
@@ -155,7 +155,8 @@
             <AutoSizeClamps maxWidth="430"/>
             <Style val="@Lobby_Title"/>
             <AcceptsMouseTooltip val="true"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <Options val="Ellipsis | NoWrapping | StripFormatTags"/>
+            <!-- ideally we'd want <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/> ; but that wouldn't strip text tags from the tooltip -->
             <Text val="{$parent/MapFrame/@Name}"/>
             <PreserveAnchorOffset val="True"/>
         </Frame>
@@ -176,7 +177,8 @@
             <AutoSizeClamps maxWidth="340"/>
             <Style val="@Lobby_ModTitle"/>
             <AcceptsMouseTooltip val="true"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <Options val="Ellipsis | NoWrapping | StripFormatTags"/>
+            <!-- ideally we'd want <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/> ; but that wouldn't strip text tags from the tooltip -->
             <Text val="{$parent/ModFrame/@Name}"/>
             <CollapseLayout val="true"/>
 
@@ -217,7 +219,8 @@
             <AutoSizeClamps maxWidth="430"/>
             <Style val="@Lobby_Name"/>
             <AcceptsMouseTooltip val="true"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <Options val="Ellipsis | NoWrapping | StripFormatTags"/>
+            <!-- ideally we'd want <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/> ; but that wouldn't strip text tags from the tooltip -->
             <Text val="{$parent/@LobbyName}"/>
             <PreserveAnchorOffset val="True"/>
 

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/ScreenBattleMapProfile.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/ScreenBattleMapProfile.SC2Layout
@@ -284,7 +284,7 @@
             <Anchor side="Left" relative="$parent/ArcadeMapIcon/IconImage" pos="Max" offset="15"/>
             <Style val="@Arcade_GameInfo_Title"/>
             <AcceptsMouseTooltip val="true"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <Options val="Ellipsis | NoWrapping | IgnoreFormatTags"/>
             <PreserveAnchorOffset val="False"/>
             <AutoSizeClamps maxWidth="700"/>
             <Text val="{$ScreenBattleMapProfile/BattleMapFrame/@Name}"/>

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/ScreenScore.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/ScreenScore.SC2Layout
@@ -117,7 +117,7 @@
                 <AutoSizeClamps maxWidth="265"/>
                 <Style val="@Lobby_Title"/>
                 <AcceptsMouseTooltip val="true"/>
-                <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+                <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
                 <Text val="{$parent/MapFrame/@Name}"/>
             </Frame>
 
@@ -142,7 +142,7 @@
                 <AutoSizeClamps maxWidth="265"/>
                 <Style val="@Lobby_ModTitle"/>
                 <AcceptsMouseTooltip val="true"/>
-                <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+                <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
                 <Text val="{$parent/ModFrame/@Name}"/>
                 <CollapseLayout val="true"/>
 

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/UserProfileMapReviewsFrame.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/UserProfileMapReviewsFrame.SC2Layout
@@ -91,6 +91,7 @@
             <Anchor side="Left" relative="$parent/MapIcon" pos="Max" offset="10"/>
             <Anchor side="Right" relative="$parent/HelpfulLabel" pos="Min" offset="-10"/>
             <Style val="@Arcade_GameInfo_Reviews_Author"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
             <Text val="{$this/MapFrame/@Name}"/>
 
             <Frame type="BattleMapFrame" name="MapFrame">
@@ -134,7 +135,7 @@
             <Anchor side="Right" relative="$parent/AnchorFrame" pos="Max" offset="-15"/>
             <Style val="@Arcade_GameInfo_HowToPlay_Desc"/>
             <AutoSizeClamps minHeight="40"/>
-            <Options val="NewLineIfTruncated"/>
+            <Options val="NewLineIfTruncated | IgnoreWrapHints | IgnoreHyperlinks | IgnoreHotkeys | IgnoreImages | IgnoreData | IgnoreInfo | IgnoreSpaceTags | IgnoreKeys"/>
         </Frame>
 
         <Frame type="Label" name="TimeLabel">

diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/UserProfileMatchHistoryFrame.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/UserProfileMatchHistoryFrame.SC2Layout
@@ -65,6 +65,7 @@
         <Frame type="Label" name="ModNameLabel">
             <Anchor relative="$parent"/>
             <Visible val="false"/>
+            <Options val="IgnoreFormatTags"/>
 
             <StateGroup name="ModStateGroup">
                 <DefaultState val="ExtensionModState"/>
@@ -112,7 +113,7 @@
             <Anchor side="Right" relative="$parent/ModeLabel" pos="Min" offset="-10"/>
             <Style val="Profile_MatchHistory_ListItem_Title"/>
             <AcceptsMouseTooltip val="false"/>
-            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping"/>
+            <Options val="Ellipsis | TooltipIfTruncated | NoWrapping | IgnoreFormatTags"/>
             <Text val="{$parent/NameFormatFrame/@Text}"/>
         </Frame>
 

diff --git a/mods/core.sc2mod/enus.sc2data/LocalizedData/GameStrings.txt b/mods/core.sc2mod/enus.sc2data/LocalizedData/GameStrings.txt
@@ -5649,7 +5649,7 @@ UI/GlueTheme/Zeratul=Zeratul
 UI/GlueTheme/Zerg=Kerrigan
 UI/GlueThemeLabel= Background Model:
 UI/GoldAmountShort=%GOLD% G
-UI/GovernmentSplashDialogKR=본 게임물은 두 가지 등급(‘12세이용가’ 및 ‘청소년이용불가’)으로 분류되었습니다. 이용자의 연령은 게임 접속 시 자동으로 확인됩니다. <c val="f7bc07">만12세 이상 만18세 미만</c>의 어린이나 청소년은 ‘12세이용가’ 콘텐츠만 이용할 수 있으며, 만12세 미만의 어린이나 청소년이 이용하기에 부적절합니다.
+UI/GovernmentSplashDialogKR=본 게임물은 두 가지 등급(‘12세이용가’ 및 ‘청소년이용불가’)으로 분류되었습니다. 이용자의 연령은 게임 접속 시 자동으로 확인됩니다. <c val="f7bc07">만12세 이상 만19세 미만</c>의 어린이나 청소년은 ‘12세이용가’ 콘텐츠만 이용할 수 있으며, 만12세 미만의 어린이나 청소년이 이용하기에 부적절합니다.
 UI/Graph_Control=<h/>Graph
 UI/Graphics=Graphics
 UI/GraphicsAPI_Colon=Render API: