Updated for Endwalker.

PunishedPineapple · Dec 11, 2021 · 4a56cb8 · 4a56cb8
1 parent 32af198
commit 4a56cb8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/WaymarkPresetPlugin/WaymarkPresetPlugin.csproj b/WaymarkPresetPlugin/WaymarkPresetPlugin.csproj
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<TargetFramework>net5.0-windows</TargetFramework>
 		<Platforms>AnyCPU</Platforms>
-		<Version>1.3.1.0</Version>
+		<Version>1.3.1.1</Version>
 		<Authors>PunishedPineapple</Authors>
 		<Product />
 		<Copyright>Copyright © PunishedPineapple 2020-2021</Copyright>

diff --git a/WaymarkPresetPlugin/WaymarkPresetPlugin.json b/WaymarkPresetPlugin/WaymarkPresetPlugin.json
@@ -4,7 +4,7 @@
   "Punchline": "Improved Waymark Management",
   "Description": "Allows you to save, edit, place, import, export, and preview an unlimited number of waymark presets.",
   "InternalName": "WaymarkPresetPlugin",
-  "AssemblyVersion": "1.3.1.0",
+  "AssemblyVersion": "1.3.1.1",
   "RepoUrl": "https://github.com/PunishedPineapple/WaymarkPresetPlugin",
   "IconUrl": "https://github.com/PunishedPineapple/WaymarkPresetPlugin/raw/master/docs/Images/icon.png",
   "ImageUrls": [
@@ -14,6 +14,6 @@
   ],
   "ApplicableVersion": "any",
   "Tags": [ "Waymark", "Marker", "Preset", "Tool" ],
-  "DalamudApiLevel": 4,
-  "Changelog": "1.3.1.0: Added preset placement by name to the text commands."
+  "DalamudApiLevel": 5,
+  "Changelog": "1.3.1.1: Updated for Endwalker."
 }
diff --git a/WaymarkPresetPlugin/ZoneInfoHandler.cs b/WaymarkPresetPlugin/ZoneInfoHandler.cs
@@ -33,29 +33,29 @@ public static void Init( DataManager dataManager )
 			//	ID of the maps for these zones too.  The best solution (for the time being) seems to be to store a pseudo map name string (the base of the map names for that zone) that can be cross-referenced later.
 			foreach( TerritoryType zone in territorySheet.ToList() )
 			{
-				if( !mZoneInfoDict.ContainsKey( zone.Unknown10 ) && (
+				if( !mZoneInfoDict.ContainsKey( (UInt16)zone.ContentFinderCondition.Row ) && (
 						zone.ExclusiveType == 2 ||
-						mBodgeIncludeContentFinderConditionIDs.Contains( zone.Unknown10 )
+						mBodgeIncludeContentFinderConditionIDs.Contains( (UInt16)zone.ContentFinderCondition.Row )
 					) )
 				{
-					ContentFinderCondition contentRow = contentFinderSheet.GetRow( zone.Unknown10 );
+					ContentFinderCondition contentRow = contentFinderSheet.GetRow( (UInt16)zone.ContentFinderCondition.Row );
 					if(	contentRow != null && (
 							( contentRow.ContentLinkType > 0 && contentRow.ContentLinkType < 3 ) ||
-							mBodgeIncludeContentFinderConditionIDs.Contains( zone.Unknown10 )
+							mBodgeIncludeContentFinderConditionIDs.Contains( (UInt16)zone.ContentFinderCondition.Row )
 						) )
 					{
-						if( !mZoneInfoDict.ContainsKey( zone.Unknown10 ) )
+						if( !mZoneInfoDict.ContainsKey( (UInt16)zone.ContentFinderCondition.Row ) )
 						{
 							string dutyName = contentRow.Name.ToString().Trim();
 							if( dutyName.Length > 0 )
 							{
 								dutyName = dutyName.First().ToString().ToUpper() + dutyName.Substring( 1 );
 							}
-							mZoneInfoDict.Add( zone.Unknown10, new ZoneInfo( dutyName, zone.PlaceName.Value.Name, zone.RowId, zone.Map.Value.Id.ToString().Split( '/' )[0], zone.Unknown10, contentRow.Content ) );
+							mZoneInfoDict.Add( (UInt16)zone.ContentFinderCondition.Row, new ZoneInfo( dutyName, zone.PlaceName.Value.Name, zone.RowId, zone.Map.Value.Id.ToString().Split( '/' )[0], (UInt16)zone.ContentFinderCondition.Row, contentRow.Content ) );
 						}
 						if( !mTerritoryTypeIDToContentFinderIDDict.ContainsKey( zone.RowId ) )
 						{
-							mTerritoryTypeIDToContentFinderIDDict.Add( zone.RowId, zone.Unknown10 );
+							mTerritoryTypeIDToContentFinderIDDict.Add( zone.RowId, (UInt16)zone.ContentFinderCondition.Row );
 						}
 					}
 				}