ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - 95e1ae426eb3

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Jason Maltzen - 12 months ago 2023-12-07 05:55:08
jason@hiddenachievement.com

Add an info box when a detected clipped reaction could be extrapolated from a white shift.

4 files changed with 21 insertions and 3 deletions:

Models/ReactionTest.cs

Models/ReactionTestService.cs

Util/Constants.cs

Views/ReactionTestView.axaml

0 comments (0 inline, 0 general)

Models/ReactionTest.cs

➞

Show inline comments

@@ ... / @@ -69,32 +69,43 @@ namespace DesertPaintCodex.Models @@
                 NotifyPropertyChanged(nameof(CanScan));
                 NotifyPropertyChanged(nameof(ShowFirstBuffer));
                 NotifyPropertyChanged(nameof(ShowLastBuffer));
+            }
+        }
         private ClipType _clipType;
         public ClipType Clipped {
             get => _clipType;
             set
+            {
                 _clipType = value;
                 NotifyPropertyChanged(nameof(Clipped));
+            }
+        }
         private bool _whiteShift;
         public bool WhiteShift
+        {
             get => _whiteShift;
             set
+            {
                 _whiteShift = value;
                 NotifyPropertyChanged(nameof(WhiteShift));
+            }
+        }
         public bool IsAllCatalysts { get; }
         private Reaction? _reaction;
         public Reaction? Reaction { get => _reaction; set { _reaction = value; NotifyPropertyChanged(nameof(Reaction)); } }
         private Reaction? _badReaction;
         public Reaction? BadReaction { get => _badReaction; set { _badReaction = value; NotifyPropertyChanged(nameof(BadReaction)); } }
         private int _scanProgress;
         public int ScanProgress { get => _scanProgress; set { _scanProgress = value; NotifyPropertyChanged(nameof(ScanProgress)); } }
         private TestState _state;
         public TestState State
+        {
@@ ... / @@ -139,39 +150,40 @@ namespace DesertPaintCodex.Models @@
         public bool ShowFirstBuffer => Requires3Way && UseFirstBuffer;
         public bool ShowLastBuffer => Requires3Way && !UseFirstBuffer;
         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)); } }
         private readonly PaintRecipe _recipe = new();
         public bool IsStub { get; }
         public ReactionTest(Reagent reagent1, Reagent reagent2, Reaction? reaction, ClipType clipType, bool isStub = false)
+        public ReactionTest(Reagent reagent1, Reagent reagent2, Reaction? reaction, ClipType clipType, bool whiteShift, bool isStub = false)
+        {
             Reagent1 = reagent1;
             Reagent2 = reagent2;
             UseFirstBuffer = true;
             IsAllCatalysts = reagent1.IsCatalyst && reagent2.IsCatalyst;
             Clipped = clipType;
             WhiteShift = whiteShift;
             Reaction = reaction;
             State = (reaction != null) ? TestState.Saved :
                 (clipType == ClipType.None) ? TestState.Untested : TestState.ClippedResult;
             _recipe.AddReagent(reagent1.Name);
             _recipe.AddReagent(reagent2.Name);
             IsStub = isStub;
             UpdateHypotheticalColor();
+        }
         #region Actions
         public async Task StartScan()
+        {
             Clipped = ClipType.None;
             ScanProgress = 0;
             Reaction = null;
@@ ... / @@ -240,32 +252,33 @@ namespace DesertPaintCodex.Models @@
                                 (reaction.Blue < 0))
+                            {
                                 // White-shift down clip.
                                 extrapolated                    = ExtrapolateWhiteFromOneChannel(_observedColor.Red,   0, reaction.Red);
                                 if (!extrapolated) extrapolated = ExtrapolateWhiteFromOneChannel(_observedColor.Green, 0, reaction.Green);
                                 if (!extrapolated) extrapolated = ExtrapolateWhiteFromOneChannel(_observedColor.Blue,  0, reaction.Blue);
+                            }
                             else if ((reaction.Red > 0) &&
                                 (reaction.Green > 0) &&
                                 (reaction.Blue > 0))
+                            {
                                 // White-shift up clip.
                                 extrapolated                    = ExtrapolateWhiteFromOneChannel(_observedColor.Red,   255, reaction.Red);
                                 if (!extrapolated) extrapolated = ExtrapolateWhiteFromOneChannel(_observedColor.Green, 255, reaction.Green);
                                 if (!extrapolated) extrapolated = ExtrapolateWhiteFromOneChannel(_observedColor.Blue,  255, reaction.Blue);
+                            }
                             WhiteShift = extrapolated;
+                        }
                         if (!extrapolated)
+                        {
                             State       = TestState.ClippedResult;
                             BadReaction = CalculateReaction();
+                        }
+                    }
                     PlayerProfile? profile = ProfileManager.CurrentProfile;
                     profile?.SetPairClipStatus(Reagent1, Reagent2, Clipped);
+                }
+            }
             else
+            {
                 Debug.WriteLine("ERROR: Lab UI not found.");

Models/ReactionTestService.cs

➞

Show inline comments

@@ ... / @@ -21,33 +21,33 @@ namespace DesertPaintCodex.Models @@
             _allTests.Clear();
             PlayerProfile? profile = ProfileManager.CurrentProfile;
             Debug.Assert(profile != null);
             List<string> reagentNames = ReagentService.Names;
             foreach (Reagent reagent1 in reagentNames.Select(ReagentService.GetReagent))
+            {
                 foreach (Reagent reagent2 in reagentNames.Select(ReagentService.GetReagent))
+                {
                     if (reagent1 == reagent2) continue;
                     Reaction? reaction = profile.FindReaction(reagent1, reagent2);
                     ClipType clipType = profile.PairClipStatus(reagent1, reagent2);
                     ReactionTest test = new(reagent1, reagent2, reaction, clipType)
+                    ReactionTest test = new(reagent1, reagent2, reaction, clipType, false)
+                    {
                         Clipped  = clipType,
                         Reaction = reaction,
                     };
                     _allTests.Add(test);
+                }
+            }
+        }
         public static void PopulateRemainingTests(ObservableCollection<ReactionTest> collection)
+        {
             collection.Clear();
             collection.AddRange(_allTests.Where(test => test.State != ReactionTest.TestState.Saved).OrderBy(test => test));
+        }

Util/Constants.cs

➞

Show inline comments

@@ ... / @@ -8,25 +8,25 @@ namespace DesertPaintCodex.Util @@
         public static int DefaultScreenWidth = 1920;
         public static int DefaultScreenHeight = 1080;
         public static int DefaultScreenX = 0;
         public static int DefaultScreenY = 0;
         private static ReactionTest? _stubReactionTest = null;
         public static ReactionTest StubReactionTest
+        {
             get
+            {
                 if (_stubReactionTest == null)
+                {
                     _stubReactionTest = new ReactionTest(
                         new Reagent("Toad Skin", "ToadSkin", 48, 96, 48, 0),
                         new Reagent("Falcons Bait", "FalconBait", 128, 240, 224, 1),
                         null, ClipType.None, true);
+                        null, ClipType.None, false, true);
+                }
                 return _stubReactionTest;
+            }
+        }
+    }
+}
@@ ... / \ No newline at end of file @@

Views/ReactionTestView.axaml

➞

Show inline comments

@@ ... / @@ -121,31 +121,36 @@ @@
             <views:EmbeddedWarningBox IsVisible="{Binding ReactionTest.NoLab}"
                 Title="🛇 PIGMENT LAB NOT FOUND"
                 Message="You may want to make sure your view of the Pigment Lab is clear, and that your screen settings are correct.">
                 <Button Command="{Binding OpenScreenSettings}">
                     <TextBlock FontWeight="Bold" FontSize="15">SCREEN SETTINGS</TextBlock>
                 </Button>
             </views:EmbeddedWarningBox>
         </StackPanel>
         <StackPanel DockPanel.Dock="Top" Orientation="Vertical" Spacing="5"
                     IsVisible="{Binding ReactionTest.HasReaction}">
             <TextBlock Classes="BlockHeader">REACTION OBSERVED</TextBlock>
             <StackPanel Orientation="Horizontal" Spacing="21" Margin="0 5">
                 <views:ReactionUnitView Reaction="{Binding ReactionTest.Reaction}"/>
             </StackPanel>
           <views:EmbeddedWarningBox Title="🛈 EXTRAPOLATED REACTION"
                                     IsVisible="{Binding ReactionTest.WhiteShift}"
                                     Message="One component of the reaction clipped, but a value could be extrapolated from the shift in the color components.">
           </views:EmbeddedWarningBox>
             <views:EmbeddedWarningBox Title="🛇 REACTION CLIPPED"
                                       IsVisible="{Binding !!ReactionTest.Clipped}"
                                       Message="Your reaction fell outside of measurable values. We will need to use a buffer pigment to test it.">
                 <StackPanel Orientation="Vertical" Spacing="10">
                     <Button Command="{Binding ShowClipInfo}">LEARN MORE</Button>
                 </StackPanel>
             </views:EmbeddedWarningBox>
         </StackPanel>
         <Button IsVisible="{Binding ReactionTest.CanClear}"
                 Command="{Binding ClearReaction}">Clear Reaction</Button>
         <Button IsVisible="{Binding ReactionTest.CanSave}"
                 Command="{Binding SaveReaction}">Save Reaction</Button>
     </StackPanel>
 </UserControl>
@@ ... / \ No newline at end of file @@

0 comments (0 inline, 0 general)