ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - f419334a476f

Parent rev.

Child rev.

[Not reviewed]

R_T10_1.0 default

0 6 0

Tess Snider (Malkyne) - 3 years ago 2021-07-19 15:16:24
this@malkyne.org

Improved up behavior for clipped reactions and 3-way reactions, and fixed
related bugs.

6 files changed with 77 insertions and 27 deletions:

Models/PlayerProfile.cs

Models/ReactionTest.cs

Models/ReactionTestService.cs

ViewModels/ReactionTestViewModel.cs

Views/MainWindow.axaml

Views/ReactionTestView.axaml

0 comments (0 inline, 0 general)

Models/PlayerProfile.cs

➞

Show inline comments

@@ ... / @@ -27,9 +27,9 @@ namespace DesertPaintCodex.Models @@
         public string Name { get; private set; }
         public ReactionSet Reactions { get; } = new();
-        private Dictionary<string, Dictionary<string, ClipType>> Clippers { get; } = new();
+        public Dictionary<string, Dictionary<string, ClipType>> Clippers { get; } = new();
         public string ReagentFile { get; }
         public Dictionary<string, PaintRecipe> Recipes { get; } = new();
@@ ... / @@ -308,9 +308,9 @@ namespace DesertPaintCodex.Models @@
+            }
             if (!File.Exists(_clipFile)) return true;
+            {
-                using StreamReader reader = new StreamReader(_clipFile);
                 using StreamReader reader = new(_clipFile);
                 while ((line = reader.ReadLine()) != null)
+                {
                     string[] tokens = line.Split(' ');
@@ ... / @@ -353,32 +353,52 @@ namespace DesertPaintCodex.Models @@
+                        }
+                    }
+                }
+            }
-            using (StreamWriter writer = new StreamWriter(_clipFile, false))
             using (StreamWriter writer = new(_clipFile, false))
+            {
                 foreach (var item1 in Clippers)
+                {
                     foreach (var item2 in item1.Value)
+                    {
                         if (item2.Value == ClipType.None) continue;
                         writer.WriteLine(item1.Key + " " + item2.Key + " " + (int)item2.Value);
+                    }
+                }
+            }
+        }
-        public ClipType PairClipStatus(string reagent1, string reagent2)
+        public ClipType PairClipStatus(Reagent reagent1, Reagent reagent2)
+        {
             if (Clippers.TryGetValue(reagent1, out var item1))
+            if (Clippers.TryGetValue(reagent1.PracticalPaintName, out var item1))
+            {
                 if (item1.TryGetValue(reagent2, out var clipType))
+                if (item1.TryGetValue(reagent2.PracticalPaintName, out var clipType))
+                {
                     return clipType;
+                }
+            }
             return ClipType.None;
+        }
         public void SetPairClipStatus(Reagent reagent1, Reagent reagent2, ClipType clip)
+        {
             if (Clippers.TryGetValue(reagent1.PracticalPaintName, out var item1))
+            {
                 if (item1.TryGetValue(reagent2.PracticalPaintName, out var clipType))
+                {
                     if (clipType == clip) return;
+                }
+            }
             else
+            {
                 item1 = new Dictionary<string, ClipType>();
                 Clippers.Add(reagent1.PracticalPaintName, item1);
+            }
             item1[reagent2.PracticalPaintName] = clip;
             Save();
+        }
         private void LoadRecipes(Dictionary<string, PaintRecipe> recipeDict, string filename, uint concentration)
+        {
             foreach (PaintRecipe recipe in recipeDict.Values)
+            {

Models/ReactionTest.cs

➞

Show inline comments

@@ ... / @@ -44,10 +44,10 @@ namespace DesertPaintCodex.Models @@
                     _recipe.AddReagent(Reagent1.Name);
                     _recipe.AddReagent(Reagent2.Name);
+                }
                 NotifyPropertyChanged(nameof(BufferReagent));
                 NotifyPropertyChanged(nameof(HypotheticalColor));
                 NotifyPropertyChanged(nameof(CanScan));
                 UpdateHypotheticalColor();
+            }
+        }
         private ClipType _clipType;
@@ ... / @@ -88,31 +88,34 @@ namespace DesertPaintCodex.Models @@
                 NotifyPropertyChanged(nameof(HasReaction));
                 NotifyPropertyChanged(nameof(CanClear));
                 NotifyPropertyChanged(nameof(CanSave));
                 NotifyPropertyChanged(nameof(NoLab));
                 NotifyPropertyChanged(nameof(CanPickBuffer));
+            }
+        }
         public bool Requires3Way =>
             (State == TestState.ClippedResult) || IsAllCatalysts;
         public bool CanScan => (State == TestState.Untested) || (State == TestState.LabNotFound) ||
             ((State == TestState.ClippedResult) && (BufferReagent != null));
         public bool CanScan => (State is TestState.Untested or TestState.LabNotFound) || ((State == TestState.ClippedResult) && (BufferReagent != null));
         public bool IsScanning => State == TestState.Scanning;
         public bool HasResults => State is TestState.ClippedResult or TestState.GoodResult or TestState.LabNotFound;
+        public bool HasResults => (ObservedColor != null) && (State is TestState.ClippedResult or TestState.GoodResult or TestState.LabNotFound);
         public bool HasReaction => State is TestState.ClippedResult or TestState.GoodResult or TestState.Saved;
         public bool CanClear => State is TestState.ClippedResult or TestState.GoodResult or TestState.Saved;
         public bool CanSave => State == TestState.GoodResult;
         public bool NoLab => State == TestState.LabNotFound;
         public bool CanPickBuffer => (State == TestState.ClippedResult) || IsAllCatalysts;
         public PaintColor? HypotheticalColor => (IsAllCatalysts && (BufferReagent == null)) ? null : _recipe.BaseColor;
         private PaintColor? _hypotheticalColor;
         public PaintColor? HypotheticalColor { get => _hypotheticalColor; set { _hypotheticalColor = value; NotifyPropertyChanged(nameof(HypotheticalColor)); } }
         private PaintColor? _observedColor;
         public PaintColor? ObservedColor { get => _observedColor; set { _observedColor = value; NotifyPropertyChanged(nameof(ObservedColor)); } }
@@ ... / @@ -132,8 +135,9 @@ namespace DesertPaintCodex.Models @@
                 (clipType == ClipType.None) ? TestState.Untested : TestState.ClippedResult;
             _recipe.AddReagent(reagent1.Name);
             _recipe.AddReagent(reagent2.Name);
             IsStub = isStub;
             UpdateHypotheticalColor();
+        }
         #region Actions
@@ ... / @@ -172,15 +176,17 @@ namespace DesertPaintCodex.Models @@
                     if (Clipped == ClipType.None)
+                    {
                         State = TestState.GoodResult;
                         Reaction = CalculateReaction();
+                    }
                     else
+                    {
                         State = TestState.ClippedResult;
                         BadReaction = CalculateReaction();
+                    }
                     PlayerProfile? profile = ProfileManager.CurrentProfile;
                     profile?.SetPairClipStatus(Reagent1, Reagent2, Clipped);
+                }
+            }
             else
+            {
@@ ... / @@ -205,8 +211,9 @@ namespace DesertPaintCodex.Models @@
+        {
             PlayerProfile? profile = ProfileManager.CurrentProfile;
             if (profile == null) return;
             profile.Reactions.Remove(Reagent1, Reagent2);
             profile.SetPairClipStatus(Reagent1, Reagent2, ClipType.None);
             if (State == TestState.Saved)
+            {
                 profile.Save();
+            }
@@ ... / @@ -234,17 +241,22 @@ namespace DesertPaintCodex.Models @@
             if (ProfileManager.CurrentProfile == null) return null;
             if (HypotheticalColor == null) return null;
             if (ObservedColor == null) return null;
-            if (Requires3Way)
+            if (BufferReagent != null)
+            {
                 if (BufferReagent == null) return null;
                 return ReactionScannerService.Calculate3WayReaction(ProfileManager.CurrentProfile, HypotheticalColor,
                     ObservedColor, BufferReagent, Reagent1, Reagent2);
+            }
             return ReactionScannerService.CalculateReaction(HypotheticalColor, ObservedColor);
+        }
         private void UpdateHypotheticalColor()
+        {
             HypotheticalColor = null;
             HypotheticalColor = (IsAllCatalysts && (BufferReagent == null)) ? null : _recipe.BaseColor;
+        }
         #endregion

Models/ReactionTestService.cs

➞

Show inline comments

@@ ... / @@ -31,9 +31,9 @@ namespace DesertPaintCodex.Models @@
+                {
                     if (reagent1 == reagent2) continue;
                     Reaction? reaction = profile.FindReaction(reagent1, reagent2);
-                    ClipType clipType = profile.PairClipStatus(reagent1.Name, reagent2.Name);
                     ClipType clipType = profile.PairClipStatus(reagent1, reagent2);
                     ReactionTest test = new(reagent1, reagent2, reaction, clipType)
+                    {
                         Clipped  = clipType,

ViewModels/ReactionTestViewModel.cs

➞

Show inline comments

@@ ... / @@ -9,9 +9,8 @@ using System.Threading.Tasks; @@
 using DesertPaintCodex.Models;
 using DesertPaintCodex.Services;
 using DesertPaintCodex.Util;
 using ReactiveUI;
 using DynamicData;
 namespace DesertPaintCodex.ViewModels
+{
     public class ReactionTestViewModel : ViewModelBase
@@ ... / @@ -23,18 +22,23 @@ namespace DesertPaintCodex.ViewModels @@
             set => this.RaiseAndSetIfChanged(ref _reactionTest, value);
+        }
         private readonly List<Reagent> _allPigmentList = new();
         public ObservableCollection<Reagent> BufferPigmentList { get; } = new();
         private readonly List<Reagent> _allReagentList = new();
         public ObservableCollection<Reagent> BufferList { get; } = new();
         public ReactionTestViewModel()
+        {
             List<string> reagentNames = ReagentService.Names;
-            foreach (var reagent in reagentNames.Select(ReagentService.GetReagent).Where(x => !x.IsCatalyst))
             foreach (var reagent in reagentNames.Select(ReagentService.GetReagent))
+            {
                 _allPigmentList.Add(reagent);
                 if (!reagent.IsCatalyst)
+                {
                     _allPigmentList.Add(reagent);
+                }
                 _allReagentList.Add(reagent);
+            }
             this.WhenAnyValue(x => x.ReactionTest)
                 .Subscribe(_ => UpdateDerivedState());
@@ ... / @@ -63,12 +67,25 @@ namespace DesertPaintCodex.ViewModels @@
         private void FilterBufferPigments()
+        {
             // Avalonia doesn't really have proper filtering for listy controls yet.
             BufferPigmentList.Clear();
             PlayerProfile? profile = ProfileManager.CurrentProfile;
             if (profile == null) return;
             ReactionSet reactions = profile.Reactions;
             BufferList.Clear();
             List<Reagent> bufferList = ReactionTest.IsAllCatalysts ? _allPigmentList : _allReagentList;
             foreach (Reagent pigment in bufferList)
+            {
                 if (pigment == ReactionTest.Reagent1) continue;
                 if (pigment == ReactionTest.Reagent2) continue;
                 if (reactions.Find(pigment, ReactionTest.Reagent1) == null) continue;
                 if (reactions.Find(pigment, ReactionTest.Reagent2) == null) continue;
                 BufferList.Add(pigment);
+            }
             BufferPigmentList.AddRange(_allPigmentList.Where(pigment =>
                     pigment != ReactionTest.Reagent1 && pigment != ReactionTest.Reagent2));
             // BufferPigmentList.AddRange(_allPigmentList.Where(pigment =>
             //         pigment != ReactionTest.Reagent1 && pigment != ReactionTest.Reagent2));
+        }
         public async void Analyze()
+        {

Views/MainWindow.axaml

➞

Show inline comments

@@ ... / @@ -6,8 +6,9 @@ @@
         xmlns:views="clr-namespace:DesertPaintCodex.Views"
         mc:Ignorable="d" d:DesignWidth="640" d:DesignHeight="800"
         Width="640" Height="800"
         MinWidth="600" MinHeight="500"
         Topmost="True"
         x:Class="DesertPaintCodex.Views.MainWindow"
         Icon="/Assets/desert_paint_codex_icon.ico"
         Title="Desert Paint Codex">

Views/ReactionTestView.axaml

➞

Show inline comments

@@ ... / @@ -38,11 +38,11 @@ @@
             <Border Classes="ThinFrame">
                 <StackPanel Orientation="Vertical" Spacing="10">
                     <StackPanel Classes="ReagentRow" IsVisible="{Binding ReactionTest.Requires3Way}">
                         <TextBlock Classes="ReagentLabel">Buffer:</TextBlock>
                         <TextBlock Classes="ReagentName" Text="{Binding ReactionTest.BufferReagent.Name, FallbackValue=[Unknown]}" IsVisible="{Binding !ReactionTest.CanScan}"/>
                         <ComboBox Items="{Binding BufferPigmentList}"
                                   IsVisible="{Binding ReactionTest.CanScan}"
                         <TextBlock Classes="ReagentName" Text="{Binding ReactionTest.BufferReagent.Name, FallbackValue=[Unknown]}" IsVisible="{Binding !ReactionTest.CanPickBuffer}"/>
                         <ComboBox Items="{Binding BufferList}"
                                   IsVisible="{Binding ReactionTest.CanPickBuffer}"
                                   SelectedItem="{Binding ReactionTest.BufferReagent}"
                                   PlaceholderText="Choose" Width="120" Height="30">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>

0 comments (0 inline, 0 general)