Merge pull request #11 from nanderson11/4-shadowlands

4 shadowlands

.vscode/settings.json

@@ -46,6 +46,104 @@
 		"AtlasLoot",
 		"ElvPrivateDB",
 		"ChatEdit_InsertLink",
-		"ACHIEVEMENT_TOOLTIP_COMPLETE"
+		"ACHIEVEMENT_TOOLTIP_COMPLETE",
+		"FauxScrollFrame_Update",
+		"UIParent",
+		"GameTooltip",
+		"UISpecialFrames",
+		"FauxScrollFrame_GetOffset",
+		"ITEM_LEVEL",
+		"STAT_AVERAGE_ITEM_LEVEL_TOOLTIP",
+		"HideUIPanel",
+		"ShowUIPanel",
+		"tContains",
+		"RAID_CLASS_COLORS",
+		"MouseIsOver",
+		"OVERVIEW",
+		"FACTION_HORDE",
+		"FACTION_ALLIANCE",
+		"REPUTATION",
+		"ACHIEVEMENTS",
+		"QUESTS_COLON",
+		"AchievementFrame_SelectAchievement",
+		"AchievementFrame",
+		"NavBar_Reset",
+		"EncounterJournal_DisplayInstance",
+		"EncounterJournal_DisplayEncounter",
+		"WorldMapFrame",
+		"ToggleEncounterJournal",
+		"EncounterJournal",
+		"ToggleFrame",
+		"EncounterJournalCloseButton",
+		"GameTooltipTextLeft1",
+		"HybridScrollFrame_CreateButtons",
+		"MainMenuMicroButton_HideAlert",
+		"MicroButtonPulseStop",
+		"UpdateMicroButtons",
+		"HybridScrollFrame_Update",
+		"ALL_INVENTORY_SLOTS",
+		"EJMicroButton",
+		"PLAYER_DIFFICULTY1",
+		"PLAYER_DIFFICULTY2",
+		"PLAYER_DIFFICULTY6",
+		"PLAYER_DIFFICULTY_TIMEWALKER",
+		"PLAYER_DIFFICULTY3",
+		"INVTYPE_HEAD",
+		"INVTYPE_NECK",
+		"INVTYPE_SHOULDER",
+		"INVTYPE_CLOAK",
+		"INVTYPE_CHEST",
+		"INVTYPE_WRIST",
+		"INVTYPE_HAND",
+		"INVTYPE_WAIST",
+		"INVTYPE_LEGS",
+		"INVTYPE_FEET",
+		"INVTYPE_WEAPONMAINHAND",
+		"INVTYPE_WEAPONOFFHAND",
+		"INVTYPE_FINGER",
+		"INVTYPE_TRINKET",
+		"EJ_LOOT_SLOT_FILTER_OTHER",
+		"EJSuggestFrame_OpenFrame",
+		"EJ_ContentTab_Select",
+		"SetItemButtonQuality",
+		"HybridScrollFrame_GetOffset",
+		"ALL_CLASSES",
+		"CLASS",
+		"ALL_SPECS",
+		"ShowInspectCursor",
+		"BOSS_INFO_STRING",
+		"BOSS_INFO_STRING_MANY",
+		"EJ_CLASS_FILTER",
+		"ENCOUNTER_JOURNAL_DIFF_TEXT",
+		"BOSS_INFO_STRING_TWO",
+		"SlashCmdList",
+		"hash_SlashCmdList",
+		"AddonCompartmentFrame",
+		"StaticPopup_HasDisplayedFrames",
+		"STATICPOPUP_NUMDIALOGS",
+		"StaticPopup_IsLastDisplayedFrame",
+		"UIDROPDOWNMENU_MAXLEVELS",
+		"ExecuteFrameScript",
+		"DropDownMenuButtonMixin",
+		"VIDEO_QUALITY_LABEL6",
+		"TooltipBackdropTemplateMixin",
+		"SharedTooltip_SetBackdropStyle",
+		"GameTooltip_Hide",
+		"GameTooltip_AddErrorLine"
+	],
+	"Lua.runtime.version": "Lua 5.1",
+	"Lua.runtime.builtin": {
+		"basic": "disable",
+		"debug": "disable",
+		"io": "disable",
+		"math": "disable",
+		"os": "disable",
+		"package": "disable",
+		"string": "disable",
+		"table": "disable",
+		"utf8": "disable"
+	},
+	"Lua.workspace.library": [
+		"~\\.vscode\\extensions\\ketho.wow-api-0.17.6\\Annotations"
 	]
-}
+}

Atlas.toc

@@ -67,3 +67,4 @@ Data\MistsofPandaria-Retail.lua
 Data\WarlordsofDraenor-Retail.lua
 Data\Legion-Retail.lua
 Data\BattleforAzeroth-Retail.lua
+Data\Shadowlands-Retail.lua

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.2.0 - November 7, 2024
+
+### Added
+
+- Retail: Added Shadowlands maps! There are a couple asterisks, the first being that maps of interior areas aren't included. Interior minimaps work differently from exterior minimaps, and I wasn't able to find a reasonable way to make them. The second asterisk is that entrances, connections and bosses (when boss portraits are disabled) aren't marked. Previously those were embedded into the image, but I would like to change that so they get added dynamically.
+
 ## 3.1.0 - October 29, 2024
 
 ### Added

Core/Atlas.lua

@@ -790,6 +790,15 @@ function addon:MapAddNPCButton()
 				end
 				button:SetPoint("TOPLEFT", "AtlasFrame", "TOPLEFT", info_x + 18, -info_y - 82)
 				button:SetID(info_id)
+				-- TODO: This will set a letter texture on non-encounter buttons but it should be formatted text because there are some things that are not just letters
+				--       The other problem is just restricting it to new maps
+				--[[ if (info_id > 10000) then
+					button.LetterImage:SetTexture("Interface\\AddOns\\Atlas\\Images\\Atlas_Marks_Letters1");
+					if (ATLAS_LETTER_MARKS_TCOORDS["Atlas_Letter_Blue_"..info_mark]) then
+						local temp = ATLAS_LETTER_MARKS_TCOORDS["Atlas_Letter_Blue_"..info_mark];
+						button.LetterImage:SetTexCoord(temp[1], temp[2], temp[3], temp[4]);
+					end
+				end ]]
 				button:Show()
 				buttonS:SetPoint("TOPLEFT", "AtlasFrameSmall", "TOPLEFT", info_x + 18, -info_y - 82)
 				buttonS:SetID(info_id)
@@ -1376,24 +1385,24 @@ function Atlas_MapRefresh(mapID)
 			if (AtlasMapPath) then break; end
 		end
 	end
+
 	if (AtlasMapPath) then
 		AtlasMap:SetTexture(AtlasMapPath..zoneID)
 		AtlasMapSmall:SetTexture(AtlasMapPath..zoneID)
 	end
 
-	local AtlasMap_Text = _G["AtlasMap_Text"]
-	local AtlasMapS_Text = _G["AtlasMapS_Text"]
-	if (not AtlasMap_Text) then
-		AtlasMap_Text = AtlasFrame:CreateFontString("AtlasMap_Text", "OVERLAY", "GameFontHighlightLarge")
-	end
-	if (not AtlasMapS_Text) then
-		AtlasMapS_Text = AtlasFrameSmall:CreateFontString("AtlasMapS_Text", "OVERLAY", "GameFontHighlightLarge")
-	end
-	AtlasMap_Text:SetPoint("CENTER", "AtlasFrame", "LEFT", 256, -32)
-	AtlasMapS_Text:SetPoint("CENTER", "AtlasFrameSmall", "LEFT", 256, -32)
 	-- Check if the map image is available, if not replace with black and Map Not Found text
-	AtlasMap_Text:SetText("")
-	AtlasMapS_Text:SetText("")
+	if (not GetFileIDFromPath(AtlasMapPath..zoneID)) then
+		AtlasMap:SetColorTexture(0, 0, 0);
+		AtlasMap_Text:SetText(L["MapNotYetAvailable"])
+		AtlasMapSmall:SetColorTexture(0, 0, 0);
+		AtlasMapS_Text:SetText(L["MapNotYetAvailable"])
+		AtlasMap_Text:Show()
+		AtlasMapS_Text:Show()
+	else
+		AtlasMap_Text:Hide()
+		AtlasMapS_Text:Hide()
+	end
 
 	-- Large Atlas map
 	if (base.LargeMap) then

Core/Atlas.xml

@@ -258,6 +258,10 @@
 							</Anchors>
 						</Texture>
 					</Layer>
+					<Layer level="OVERLAY">
+						<FontString name="AtlasMap_Text" inherits="GameFontHighlightLarge" justifyH="CENTER" justifyV="MIDDLE">
+						</FontString>
+					</Layer>
 				</Layers>
 			</Frame>
 		</Frames>
@@ -806,6 +810,10 @@
 							</Anchors>
 						</Texture>
 					</Layer>
+					<Layer level="OVERLAY">
+						<FontString name="AtlasMapS_Text" inherits="GameFontHighlightLarge" justifyH="CENTER" justifyV="MIDDLE">
+						</FontString>
+					</Layer>
 				</Layers>
 			</Frame>
 		</Frames>