diff --git a/TitanClassic/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundBottom0.tga b/TitanClassic/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundBottom0.tga index 25fabdb..9b7af2f 100644 Binary files a/TitanClassic/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundBottom0.tga and b/TitanClassic/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundBottom0.tga differ diff --git a/TitanClassic/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundBottom0.tga b/TitanClassic/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundBottom0.tga index e56e01f..ed78b71 100644 Binary files a/TitanClassic/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundBottom0.tga and b/TitanClassic/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundBottom0.tga differ diff --git a/TitanClassic/locale/Localization.BR.lua b/TitanClassic/locale/Localization.BR.lua index 049d96f..f97d5ba 100644 --- a/TitanClassic/locale/Localization.BR.lua +++ b/TitanClassic/locale/Localization.BR.lua @@ -331,6 +331,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Localização da Casa"; L["TITAN_LOCATION_TOOLTIP_INN"] = "Estalagem: "; L["TITAN_LOCATION_MENU_TEXT"] = "Localização"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Exibir Zone Text"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Exibir Coordinates on World Map"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Cursor: %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Jogador: %s"; diff --git a/TitanClassic/locale/Localization.CN.lua b/TitanClassic/locale/Localization.CN.lua index 00bfac9..857bb73 100644 --- a/TitanClassic/locale/Localization.CN.lua +++ b/TitanClassic/locale/Localization.CN.lua @@ -329,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "炉石位置"; L["TITAN_LOCATION_TOOLTIP_INN"] = "旅店: "; L["TITAN_LOCATION_MENU_TEXT"] = "坐标"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "显示区域信息"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "在世界地图上显示坐标"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "鼠标位置(X,Y): %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "玩家位置(X,Y): %s"; diff --git a/TitanClassic/locale/Localization.DE.lua b/TitanClassic/locale/Localization.DE.lua index 6eac4cb..624a774 100644 --- a/TitanClassic/locale/Localization.DE.lua +++ b/TitanClassic/locale/Localization.DE.lua @@ -329,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Heimatort: "; L["TITAN_LOCATION_TOOLTIP_INN"] = "Gasthaus: "; L["TITAN_LOCATION_MENU_TEXT"] = "Position"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Zonentext in der Leiste anzeigen"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Koordinaten auf der Weltkarte anzeigen"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Mauszeiger (X,Y): %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Spieler (X,Y): %s"; diff --git a/TitanClassic/locale/Localization.ES.lua b/TitanClassic/locale/Localization.ES.lua index ab3aa0e..c25d1b7 100644 --- a/TitanClassic/locale/Localization.ES.lua +++ b/TitanClassic/locale/Localization.ES.lua @@ -345,6 +345,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Ubicación de mi casa"; L["TITAN_LOCATION_TOOLTIP_INN"] = "Posada: "; L["TITAN_LOCATION_MENU_TEXT"] = "Ubicación"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Mostrar texto de zona"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Mostrar coordenadas en el mapamundi"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Cursor(X,Y): %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Jugador(X,Y): %s"; diff --git a/TitanClassic/locale/Localization.FR.lua b/TitanClassic/locale/Localization.FR.lua index be11a71..f12f722 100644 --- a/TitanClassic/locale/Localization.FR.lua +++ b/TitanClassic/locale/Localization.FR.lua @@ -331,6 +331,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Position du foyer"; L["TITAN_LOCATION_TOOLTIP_INN"] = "Auberge : "; L["TITAN_LOCATION_MENU_TEXT"] = "Position"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Montrer le texte de la zone"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Montrer les coordonnées sur la carte du monde"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Curseur : %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Joueur : %s"; diff --git a/TitanClassic/locale/Localization.IT.lua b/TitanClassic/locale/Localization.IT.lua index 004e6d6..6bce048 100644 --- a/TitanClassic/locale/Localization.IT.lua +++ b/TitanClassic/locale/Localization.IT.lua @@ -329,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Home Location"; L["TITAN_LOCATION_TOOLTIP_INN"] = "Inn: "; L["TITAN_LOCATION_MENU_TEXT"] = "Località"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Mostra testo zona"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Mostra coordinate sulla mappa"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Cursore: %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Giocatore: %s"; diff --git a/TitanClassic/locale/Localization.KR.lua b/TitanClassic/locale/Localization.KR.lua index e4e5905..c4c1423 100644 --- a/TitanClassic/locale/Localization.KR.lua +++ b/TitanClassic/locale/Localization.KR.lua @@ -329,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "여관 위치"; L["TITAN_LOCATION_TOOLTIP_INN"] = "여관: "; L["TITAN_LOCATION_MENU_TEXT"] = "좌표"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "지역 표시"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "세계 지도에 좌표 표시"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "커서(X,Y): %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "플레이어(X,Y): %s"; diff --git a/TitanClassic/locale/Localization.RU.lua b/TitanClassic/locale/Localization.RU.lua index 5ba0f4e..1cc07a5 100644 --- a/TitanClassic/locale/Localization.RU.lua +++ b/TitanClassic/locale/Localization.RU.lua @@ -329,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Место дома"; L["TITAN_LOCATION_TOOLTIP_INN"] = "Дом: "; L["TITAN_LOCATION_MENU_TEXT"] = "Координаты"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Показывать зону"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Показывать координаты на мировой карте"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Курсор(X,Y): %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Игрок(X,Y): %s"; diff --git a/TitanClassic/locale/Localization.TW.lua b/TitanClassic/locale/Localization.TW.lua index 2a6ae19..372aa79 100644 --- a/TitanClassic/locale/Localization.TW.lua +++ b/TitanClassic/locale/Localization.TW.lua @@ -329,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "爐石設定位置"; L["TITAN_LOCATION_TOOLTIP_INN"] = "旅館: "; L["TITAN_LOCATION_MENU_TEXT"] = "位置"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "顯示區域文字"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "顯示座標在世界地圖上"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "游標(X,Y): %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "玩家(X,Y): %s"; diff --git a/TitanClassic/locale/Localization.lua b/TitanClassic/locale/Localization.lua index fc08227..32dd5cc 100644 --- a/TitanClassic/locale/Localization.lua +++ b/TitanClassic/locale/Localization.lua @@ -269,7 +269,7 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "Show Used Slots"; L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "Show Available Slots"; L["TITAN_BAG_MENU_SHOW_DETAILED"] = "Show Detailed Tooltip"; L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "Ignore Containers"; -L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignore ammo pouch slots"; +L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignore ammo bags"; L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignore shard bags"; L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignore profession bags"; L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Soul Pouch", "Small Soul Pouch", "Box of Souls", "Felcloth Bag", "Core Felcloth Bag", "Ebon Shadowbag", "Abyssal Bag"}; @@ -334,6 +334,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Home Location"; L["TITAN_LOCATION_TOOLTIP_INN"] = "Inn: "; L["TITAN_LOCATION_MENU_TEXT"] = "Location"; L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Show Zone Text"; +L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text"; L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Show Coordinates on World Map"; L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Cursor: %s"; L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Player: %s"; diff --git a/TitanClassicLocation/TitanClassicLocation.lua b/TitanClassicLocation/TitanClassicLocation.lua index 3c8c83e..9c61ffc 100755 --- a/TitanClassicLocation/TitanClassicLocation.lua +++ b/TitanClassicLocation/TitanClassicLocation.lua @@ -42,6 +42,7 @@ function TitanPanelLocationButton_OnLoad(self) }, savedVariables = { ShowZoneText = 1, + ShowSubZoneText = 1, ShowCoordsOnMap = true, ShowCursorOnMap = true, ShowLocOnMiniMap = 1, @@ -117,7 +118,11 @@ function TitanPanelLocationButton_GetButtonText(id) if (button.zoneText == '') then _, _, button.zoneText = C_Map.GetMapInfo(C_Map.GetBestMapUnit("player")); end - locationText = TitanUtils_ToString(button.zoneText)..' '..locationText; + if (ShowSubZoneText) then + locationText = TitanUtils_ToString(button.zoneText)..' '..locationText; + else + locationText = TitanUtils_ToString(button.zoneText..' - '..button.subZoneText)..' '..locationText; + end else locationText = TitanUtils_ToString(button.subZoneText)..' '..locationText; end @@ -301,6 +306,12 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); info = {}; + info.text = L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"]; + info.func = TitanPanelLocationButton_ToggleSubZoneDisplay; + info.checked = TitanGetVar(TITAN_LOCATION_ID, "ShowSubZoneText"); + L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"]); + + info = {}; info.text = L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"]; info.func = TitanPanelLocationButton_ToggleLocationOnMap; info.checked = TitanGetVar(TITAN_LOCATION_ID, "ShowCoordsOnMap"); @@ -435,6 +446,15 @@ function TitanPanelLocationButton_ToggleDisplay() end -- ************************************************************************** +-- NAME : TitanPanelLocationButton_ToggleSubZoneDisplay() +-- DESC : Set option to show only subzone text +-- ************************************************************************** +function TitanPanelLocationButton_ToggleSubZoneDisplay() + TitanToggleVar(TITAN_LOCATION_ID, "ShowSubZoneText"); + TitanPanelButton_UpdateButton(TITAN_LOCATION_ID); +end + +-- ************************************************************************** -- NAME : TitanPanelLocationButton_ToggleLocationOnMap() -- DESC : Set option to show player coordinates on map -- **************************************************************************