add forgotten IsOriginal check

Author: LeftofZen

AvaGui/ViewModels/DatTypes/DatObjectEditorViewModel.cs

@@ -1,4 +1,5 @@
 using AvaGui.Models;
+using Avalonia.Media.Imaging;
 using OpenLoco.Common.Logging;
 using OpenLoco.Dat;
 using OpenLoco.Dat.FileParsing;
@@ -17,7 +18,7 @@ namespace AvaGui.ViewModels
 {
 	public record HexAnnotationLine(string Address, string Data, int? SelectionStart, int? SelectionEnd);
 
-	public record AnimationSequence(string Name, int StartIndex, int EndIndex);
+	public record AnimationSequence(string Name, int StartIndex, int EndIndex, int CurrentFrame = 0);
 
 	public class DatObjectEditorViewModel : ReactiveObject, ILocoFileViewModel
 	{
@@ -34,6 +35,24 @@ public class DatObjectEditorViewModel : ReactiveObject, ILocoFileViewModel
 		[Reactive]
 		public ObservableCollection<AnimationSequence> CurrentAnimations { get; set; }
 
+		public AnimationSequence CurrentAnimation => CurrentAnimations[0];
+
+		[Reactive]
+		public int CurrentFrame { get; set; }
+
+		[Reactive]
+		public Bitmap? CurrentAnimationFrame
+		{
+			get
+			{
+				if (ExtraContentViewModel is ImageTableViewModel itvm)
+				{
+					return itvm.Images[CurrentFrame];
+				}
+				return null;
+			}
+		}
+
 		ObjectEditorModel Model { get; init; }
 
 		[Reactive]
@@ -82,6 +101,9 @@ public DatObjectEditorViewModel(FileSystemItem currentFile, ObjectEditorModel mo
 
 			_ = this.WhenAnyValue(o => o.CurrentlySelectedHexAnnotation)
 				.Subscribe(_ => UpdateHexDumpView());
+
+			_ = this.WhenAnyValue(o => o.CurrentFrame)
+				.Subscribe(_ => this.RaisePropertyChanged(nameof(CurrentAnimationFrame)));
 		}
 
 		public void UpdateHexDumpView()
@@ -125,11 +147,13 @@ public void LoadObject()
 					var (treeView, annotationIdentifiers) = AnnotateFile(cf.Filename, false, null);
 					CurrentHexAnnotations = new(treeView);
 					DATDumpAnnotationIdentifiers = annotationIdentifiers;
+					CurrentAnimations = [new AnimationSequence("Normal", 0, 63)];
 				}
 				else
 				{
 					StringTableViewModel = null;
 					ExtraContentViewModel = null;
+					CurrentAnimations = [];
 				}
 			}
 			else

AvaGui/Views/MainWindow.axaml

@@ -336,7 +336,36 @@
 							</ItemsRepeater>
 						</DockPanel>
 					</TabItem>
-					<TabItem Header="Animations" DataContext="{Binding CurrentAnimations}">
+					<TabItem Header="Animations">
+						<StackPanel>
+							<Slider Value="{Binding CurrentFrame}" Minimum="0" Maximum="63"/>
+							<Image Source="{Binding CurrentAnimationFrame}" Stretch="None" />
+							<TextBlock Text="{Binding CurrentFrame}"/>
+						</StackPanel>
+						<!--<ItemsRepeater ItemsSource="{Binding CurrentAnimations}" Background="{DynamicResource ButtonBackground}">
+							<ItemsRepeater.ItemTemplate>
+								<DataTemplate>
+									<StackPanel>
+										<Slider Value="{Binding CurrentFrame}" Minimum="{Binding StartIndex}" Maximum="{Binding EndIndex}"/>
+										<Image Source="{Binding CurrentAnimationFrame}" />
+										<TextBlock Text="{Binding CurrentFrame}"/>
+									</StackPanel>
+									-->
+						<!--<Grid DockPanel.Dock="Left" Margin="4" x:DataType="vm:AnimationSequence">
+										<Grid.ColumnDefinitions>
+											<ColumnDefinition Width="Auto"/>
+											<ColumnDefinition Width="*"/>
+										</Grid.ColumnDefinitions>
+										<Border Grid.Column="0" Grid.ColumnSpan="1" Background="{DynamicResource ButtonBackgroundPointerOver}">
+											<TextBlock Text="{Binding Address}" VerticalAlignment="Center" Margin="4" FontFamily="Courier New" FontWeight="Bold" />
+
+										</Border>
+										<SelectableTextBlock Grid.Column="1" Margin="4" Text="{Binding Data}" VerticalAlignment="Center" FontFamily="Courier New" SelectionStart="{Binding SelectionStart}" SelectionEnd="{Binding SelectionEnd}" />
+									</Grid>-->
+						<!--
+								</DataTemplate>
+							</ItemsRepeater.ItemTemplate>
+						</ItemsRepeater>-->
 
 					</TabItem>
 				</TabControl>

Dat/FileParsing/SawyerStreamReader.cs

@@ -183,7 +183,7 @@ static void ValidateLocoStruct(S5Header s5Header, ILocoStruct locoStruct, ILogge
 				if (s5Header.SourceGame == SourceGame.Vanilla)
 				{
 					var s5Name = s5Header.Name;
-					if (!OriginalObjectFiles.Names.TryGetValue(s5Name, out var value) || s5Header.Checksum != value.SteamChecksum || s5Header.Checksum != value.GoGChecksum)
+					if (!s5Header.IsOriginal())
 					{
 						warnings.Add($"\"{s5Header.Name}\" is not a vanilla object but is marked as such.");
 					}