Changeset - 8ee5f618b07c
[Not reviewed]
Merge default
0 1 0
Tess Snider (Malkyne) - 3 years ago 2021-07-26 08:16:19
this@malkyne.org
Merge
1 file changed with 12 insertions and 11 deletions:
0 comments (0 inline, 0 general)
ViewModels/RecipeGeneratorViewModel.cs
Show inline comments
...
 
@@ -15,3 +15,3 @@ namespace DesertPaintCodex.ViewModels
 
    {
 
        private const long   UpdateInterval  = 2000;  // ms
 
        private const long   UpdateInterval  = 200;  // ms
 
        private const long   SaveInterval    = 30000; // ms
...
 
@@ -26,4 +26,4 @@ namespace DesertPaintCodex.ViewModels
 

	
 
        private int _permutationCount = 0;
 
        public int PermutationCount { get => _permutationCount; private set => this.RaiseAndSetIfChanged(ref _permutationCount, value); }
 
        private string _permutationCount = "0";
 
        public string PermutationCount { get => _permutationCount; private set => this.RaiseAndSetIfChanged(ref _permutationCount, value); }
 
        
...
 
@@ -244,3 +244,9 @@ namespace DesertPaintCodex.ViewModels
 
                _generator.LoadState(stateFile);
 
                
 

	
 
                // Always set these, or the values will be invalid
 
                MaxReagents = (int)_generator.MaxReagents;
 
                MaxConcentration = (int)_generator.MaxConcentration;
 
                FullQuantity = (int)_generator.FullQuantity;
 
                FullQuantityDepth = (int)_generator.FullQuantityDepth;
 

	
 
                if (_generator.CanResume)
...
 
@@ -250,7 +256,2 @@ namespace DesertPaintCodex.ViewModels
 

	
 
                    MaxReagents       = (int) _generator.MaxReagents;
 
                    MaxConcentration  = (int) _generator.MaxConcentration;
 
                    FullQuantity      = (int) _generator.FullQuantity;
 
                    FullQuantityDepth = (int) _generator.FullQuantityDepth;
 
                    
 
                    SaveSettings(mode);
...
 
@@ -326,5 +327,5 @@ namespace DesertPaintCodex.ViewModels
 
            DateTime now = DateTime.Now;
 
            
 

 
            // Update test count.
 
            PermutationCount = _newRecipeCount;
 
            PermutationCount = $"{_newRecipeCount:n0}";
 
            
0 comments (0 inline, 0 general)