Add an icon over the rat's head showing why it might not be going whe…

…re you think it logically would. Related: #88
airbreather · Nov 25, 2024 · 07e297e · 07e297e
1 parent 0b678a7
commit 07e297e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/src/Autopelago/Game.cs b/src/Autopelago/Game.cs
@@ -116,6 +116,15 @@ private set
         }
     }
 
+    public FrozenDictionary<LocationDefinitionModel, ArchipelagoItemFlags> SpoilerData
+    {
+        get
+        {
+            EnsureStarted();
+            return _spoilerData!;
+        }
+    }
+
     public int FoodFactor { get; private set; }
 
     public int LuckFactor { get; private set; }

diff --git a/src/Autopelago/ViewModels/GameStateViewModel.cs b/src/Autopelago/ViewModels/GameStateViewModel.cs
@@ -104,6 +104,10 @@ where tt.Model is RatCountRequirement
             .Select(g => g.StartledCounter);
         HasConfidence = provider.CurrentGameState
             .Select(g => g.HasConfidence);
+        MovingToSmart = provider.CurrentGameState
+            .Select(g => g.TargetLocationReason == TargetLocationReason.PriorityPriority && g.SpoilerData[g.TargetLocation] == ArchipelagoItemFlags.LogicalAdvancement);
+        MovingToConspiratorial = provider.CurrentGameState
+            .Select(g => g.TargetLocationReason == TargetLocationReason.PriorityPriority && g.SpoilerData[g.TargetLocation] == ArchipelagoItemFlags.Trap);
 
         CurrentLocation = provider.CurrentGameState
             .Select(v => v.CurrentLocation);
@@ -275,6 +279,10 @@ public void Dispose()
 
     public IObservable<bool> HasConfidence { get; }
 
+    public IObservable<bool> MovingToSmart { get; }
+
+    public IObservable<bool> MovingToConspiratorial { get; }
+
     public required ReactiveCommand<Unit, Unit> BackToMainMenuCommand { get; init; }
 
     public ReactiveCommand<Unit, Unit> PlayPauseCommand { get; }

diff --git a/src/Autopelago/ViewModels/SettingsSelectionViewModel.cs b/src/Autopelago/ViewModels/SettingsSelectionViewModel.cs
@@ -1,7 +1,6 @@
 using System.Globalization;
 using System.Reactive;
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using System.Text.RegularExpressions;
 
 using ReactiveUI;
@@ -23,8 +22,7 @@ public SettingsSelectionViewModel()
                 portValue - decimal.Round(portValue) == 0 &&
                 !string.IsNullOrWhiteSpace(slot) &&
                 minStepSeconds > 0 &&
-                maxStepSeconds >= minStepSeconds)
-            .DistinctUntilChanged();
+                maxStepSeconds >= minStepSeconds);
         ConnectCommand = ReactiveCommand.Create(() => SettingsModel, canConnect);
 
         _subscriptions.Add(this

diff --git a/src/Autopelago/Views/GameStateView.axaml b/src/Autopelago/Views/GameStateView.axaml
@@ -377,6 +377,20 @@
                                                    Canvas.Left="{Binding CurrentPoint^.X, Mode=OneWay}"
                                                    Canvas.Top="{Binding CurrentPoint^.Y, Mode=OneWay}"
                                                    RenderTransform="translate(2px, -3px)" />
+                                        <materialIcons:MaterialIcon Kind="Antenna"
+                                                                    Width="6"
+                                                                    Height="6"
+                                                                    IsVisible="{Binding MovingToConspiratorial^}"
+                                                                    Canvas.Left="{Binding CurrentPoint^.X, Mode=OneWay}"
+                                                                    Canvas.Top="{Binding CurrentPoint^.Y, Mode=OneWay}"
+                                                                    RenderTransform="translate(5px, -3px)" />
+                                        <materialIcons:MaterialIcon Kind="LightbulbDimmer10"
+                                                                    Width="6"
+                                                                    Height="6"
+                                                                    IsVisible="{Binding MovingToSmart^}"
+                                                                    Canvas.Left="{Binding CurrentPoint^.X, Mode=OneWay}"
+                                                                    Canvas.Top="{Binding CurrentPoint^.Y, Mode=OneWay}"
+                                                                    RenderTransform="translate(5px, -3px)" />
                                     </Canvas>
                                 </Panel>
                             </Viewbox>