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
26
6
Models/ReactionTest.cs
22
10
Models/ReactionTestService.cs
1
1
ViewModels/ReactionTestViewModel.cs
24
7
Views/MainWindow.axaml
1
Views/ReactionTestView.axaml
3
3
0 comments (0 inline, 0 general)
Models/PlayerProfile.cs
➞
Show inline comments
...
 
@@ -29,5 +29,5 @@ namespace DesertPaintCodex.Models
 
        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; }


			




	...
	
		
 
@@ -310,5 +310,5 @@ 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)


			




	
	
	
		
 
                {


			




	...
	
		
 
@@ -355,5 +355,5 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	
	
	
		
 
            using (StreamWriter writer = new StreamWriter(_clipFile, false))


			




	
	
	
		
 
            using (StreamWriter writer = new(_clipFile, false))


			




	
	
	
		
 
            {


			




	
	
	
		
 
                foreach (var item1 in Clippers)


			




	...
	
		
 
@@ -361,4 +361,5 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                    foreach (var item2 in item1.Value)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        if (item2.Value == ClipType.None) continue;


			




	
	
	
		
 
                        writer.WriteLine(item1.Key + " " + item2.Key + " " + (int)item2.Value);


			




	
	
	
		
 
                    }


			




	...
	
		
 
@@ -367,9 +368,9 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        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;


			




	...
	
		
 
@@ -379,4 +380,23 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        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)


			




	
	
	
		
 
        {


			




        

    


    
    

    

        

                

                    Models/ReactionTest.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -46,6 +46,6 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                }


			




	
	
	
		
 
                NotifyPropertyChanged(nameof(BufferReagent));


			




	
	
	
		
 
                NotifyPropertyChanged(nameof(HypotheticalColor));


			




	
	
	
		
 
                NotifyPropertyChanged(nameof(CanScan));


			




	
	
	
		
 
                UpdateHypotheticalColor();


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -90,4 +90,5 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                NotifyPropertyChanged(nameof(CanSave));


			




	
	
	
		
 
                NotifyPropertyChanged(nameof(NoLab));


			




	
	
	
		
 
                NotifyPropertyChanged(nameof(CanPickBuffer));


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -96,10 +97,9 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            (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;


			




	...
	
		
 
@@ -110,7 +110,10 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 

			




	
	
	
		
 
        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;


			




	...
	
		
 
@@ -134,4 +137,5 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            _recipe.AddReagent(reagent2.Name);


			




	
	
	
		
 
            IsStub = isStub;


			




	
	
	
		
 
            UpdateHypotheticalColor();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	...
	
		
 
@@ -174,5 +178,4 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                        State = TestState.GoodResult;


			




	
	
	
		
 
                        Reaction = CalculateReaction();


			




	
	
	
		
 

			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    else


			




	...
	
		
 
@@ -181,4 +184,7 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                        BadReaction = CalculateReaction();


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    

			




	
	
	
		
 
                    PlayerProfile? profile = ProfileManager.CurrentProfile;


			




	
	
	
		
 
                    profile?.SetPairClipStatus(Reagent1, Reagent2, Clipped);


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	...
	
		
 
@@ -207,4 +213,5 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            if (profile == null) return;


			




	
	
	
		
 
            profile.Reactions.Remove(Reagent1, Reagent2);


			




	
	
	
		
 
            profile.SetPairClipStatus(Reagent1, Reagent2, ClipType.None);


			




	
	
	
		
 
            if (State == TestState.Saved)


			




	
	
	
		
 
            {


			




	...
	
		
 
@@ -236,7 +243,6 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            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);


			




	...
	
		
 
@@ -244,5 +250,11 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            return ReactionScannerService.CalculateReaction(HypotheticalColor, ObservedColor);


			




	
	
	
		
 
        }


			




	
	
	
		
 
        

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        private void UpdateHypotheticalColor()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            HypotheticalColor = null;


			




	
	
	
		
 
            HypotheticalColor = (IsAllCatalysts && (BufferReagent == null)) ? null : _recipe.BaseColor;


			




	
	
	
		
 
        }


			




	
	
	
		
 
        

			




	
	
	
		
 
        #endregion


			




        

    


    
    

    

        

                

                    Models/ReactionTestService.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -33,5 +33,5 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 

			




	
	
	
		
 
                    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)


			




        

    


    
    

    

        

                

                    ViewModels/ReactionTestViewModel.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -11,5 +11,4 @@ using DesertPaintCodex.Services;


			




	
	
	
		
 
using DesertPaintCodex.Util;


			




	
	
	
		
 
using ReactiveUI;


			




	
	
	
		
 
using DynamicData;


			




	
	
	
		
 

			




	
	
	
		
 
namespace DesertPaintCodex.ViewModels


			




	...
	
		
 
@@ -25,5 +24,6 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 

			




	
	
	
		
 
        private readonly List<Reagent> _allPigmentList = new();


			




	
	
	
		
 
        public ObservableCollection<Reagent> BufferPigmentList { get; } = new();


			




	
	
	
		
 
        private readonly List<Reagent> _allReagentList = new();


			




	
	
	
		
 
        public ObservableCollection<Reagent> BufferList { get; } = new();


			




	
	
	
		
 

			




	
	
	
		
 

			




	...
	
		
 
@@ -32,7 +32,11 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
            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);


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	...
	
		
 
@@ -65,8 +69,21 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
        {


			




	
	
	
		
 
            // 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));


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    Views/MainWindow.axaml
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -8,4 +8,5 @@


			




	
	
	
		
 
        Width="640" Height="800"


			




	
	
	
		
 
        MinWidth="600" MinHeight="500"


			




	
	
	
		
 
        Topmost="True"


			




	
	
	
		
 
        x:Class="DesertPaintCodex.Views.MainWindow"


			




	
	
	
		
 
        Icon="/Assets/desert_paint_codex_icon.ico"


			




        

    


    
    

    

        

                

                    Views/ReactionTestView.axaml
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -40,7 +40,7 @@


			




	
	
	
		
 
                    <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">


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: opal4.opalstack.com-290901
    
    
        This site is powered by
            Kallithea 0.6.2,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support