fix critical bug that prevented variety when generating multiple flags

Author: p-svacha

FlagGeneration/FlagGeneration.csproj

@@ -75,6 +75,7 @@
     <Compile Include="Scripts\CoatOfArms\Coa_Prefab.cs" />
     <Compile Include="Scripts\Helper\DictionaryExtensions.cs" />
     <Compile Include="Scripts\Helper\Helper.cs" />
+    <Compile Include="Scripts\Patterns\MainPatternId.cs" />
     <Compile Include="Scripts\Patterns\Pattern_Checkers.cs" />
     <Compile Include="Scripts\Patterns\Pattern_Rays.cs" />
     <Compile Include="Scripts\Patterns\Pattern_ScatteredStripesAndSymbols.cs" />

FlagGeneration/Scripts/FlagGenerator.cs

@@ -14,15 +14,15 @@ public class FlagGenerator
 
         static Random R = new Random();
 
-        private Dictionary<FlagMainPattern, int> MainPatterns = new Dictionary<FlagMainPattern, int>()
+        private Dictionary<MainPatternId, int> MainPatterns = new Dictionary<MainPatternId, int>() // New patterns also need to be handled in GetMainPatternFromId()
         {
-            { new Pattern_Stripes(), 9000 },
-            { new Pattern_CoaOnly(), 60 },
-            { new Pattern_Diagonal(), 15 },
-            { new Pattern_Cross(), 75 },
-            { new Pattern_ScatteredStripesAndSymbols(), 50 },
-            { new Pattern_Checkers(), 40 },
-            { new Pattern_Rays(), 40 }
+            { MainPatternId.Stripes, 90 },
+            { MainPatternId.CoaOnly, 60 },
+            { MainPatternId.Diagonal, 15 },
+            { MainPatternId.Cross, 75 },
+            { MainPatternId.ScatteredStripesAndSymbols, 50 },
+            { MainPatternId.Checkers, 40 },
+            { MainPatternId.Rays, 40 }
         };
 
         public SvgDocument GenerateFlag()
@@ -33,7 +33,8 @@ public SvgDocument GenerateFlag()
                 Height = FLAG_HEIGHT
             };
 
-            FlagMainPattern mainPattern = MainPatterns.GetWeightedRandomElement(R);
+            MainPatternId mainPatternId = MainPatterns.GetWeightedRandomElement(R);
+            FlagMainPattern mainPattern = GetMainPatternFromId(mainPatternId);
             mainPattern.ApplyPattern(SvgDoc, R);
 
             return SvgDoc;
@@ -44,5 +45,28 @@ public SvgDocument GenerateFlag(int seed)
             R = new Random(seed);
             return GenerateFlag();
         }
+
+        private FlagMainPattern GetMainPatternFromId(MainPatternId id)
+        {
+            switch(id)
+            {
+                case MainPatternId.Checkers:
+                    return new Pattern_Checkers();
+                case MainPatternId.CoaOnly:
+                    return new Pattern_CoaOnly();
+                case MainPatternId.Cross:
+                    return new Pattern_Cross();
+                case MainPatternId.Diagonal:
+                    return new Pattern_Diagonal();
+                case MainPatternId.Rays:
+                    return new Pattern_Rays();
+                case MainPatternId.ScatteredStripesAndSymbols:
+                    return new Pattern_ScatteredStripesAndSymbols();
+                case MainPatternId.Stripes:
+                    return new Pattern_Stripes();
+                default:
+                    throw new Exception("Unknown MainPatternId: " + id.ToString());
+            }
+        }
     }
 }

FlagGeneration/Scripts/Patterns/MainPatternId.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlagGeneration
+{
+    public enum MainPatternId
+    {
+        Checkers,
+        CoaOnly,
+        Cross,
+        Diagonal,
+        Rays,
+        ScatteredStripesAndSymbols,
+        Stripes,
+    }
+}

FlagGeneration/Scripts/Patterns/Pattern_Stripes.cs

@@ -32,7 +32,7 @@ public enum StripeDirectionType
         }
         private Dictionary<StripeDirectionType, int> StripeDirectionProbabilities = new Dictionary<StripeDirectionType, int>()
         {
-            {StripeDirectionType.Horizontal, 6000 },
+            {StripeDirectionType.Horizontal, 60 },
             {StripeDirectionType.Vertical, 40 }
         };
 
@@ -46,7 +46,7 @@ public enum OverlayType
         private Dictionary<OverlayType, int> OverlaysProbabilities = new Dictionary<OverlayType, int>()
         {
             {OverlayType.None, 100 },
-            {OverlayType.TopLeftRect, 5000 },
+            {OverlayType.TopLeftRect, 50 },
             {OverlayType.LeftTriangle, 50 },
             {OverlayType.Antigua, 5 }
         };
@@ -114,7 +114,8 @@ public override void DoApply()
             }
 
             float[] stripeSizes = new float[NumStripes]; // Stripe size (0-1)
-            
+
+            // Check if a wide mid stripe should be applied
             if (!EvenStripes && R.NextDouble() < WIDE_MID_STRIPE_CHANCE)
             {
                 HasWideMidStripe = true;
@@ -381,16 +382,19 @@ private bool CanApplyOverlayType(OverlayType type)
                     return true;
 
                 case OverlayType.LeftTriangle:
-                    return StripeDirection == StripeDirectionType.Horizontal;
+                    if (StripeDirection != StripeDirectionType.Horizontal) return false;
+                    return true;
 
                 case OverlayType.TopLeftRect:
-                    return !HasWideMidStripe && !(StripeDirection == StripeDirectionType.Vertical && NumStripes == 3);
+                    if (HasWideMidStripe) return false;
+                    if (StripeDirection == StripeDirectionType.Vertical && NumStripes == 3) return false;
+                    return true;
 
                 case OverlayType.Antigua:
                     return true;
 
                 default:
-                    throw new Exception("Overlaytype not handled");
+                    throw new Exception("OverlayType not handled");
             }
         }