Fix spectral pack black hole and soul false positives

Tacodiva · Tacodiva · commit c5719493048b · 2025-08-18T15:41:19.000+10:00
diff --git a/Motely/MotelySingleSearchContext.Spectral.cs b/Motely/MotelySingleSearchContext.Spectral.cs
@@ -110,39 +110,56 @@ public MotelyItem GetNextSpectral(ref MotelySingleSpectralStream spectralStream)
             }
         }
 
-        return (MotelyItemType)MotelyItemTypeCategory.SpectralCard |
+        MotelyItemType spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard |
             (MotelyItemType)GetNextRandomInt(ref spectralStream.ResampleStream.InitialPrngStream, 0, MotelyEnum<MotelySpectralCard>.ValueCount);
+
+        int resampleCount = 0;
+
+        while (true)
+        {
+            if (spectral != MotelyItemType.Soul && spectral != MotelyItemType.BlackHole)
+            {
+                return spectral;
+            }
+
+            spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard | (MotelyItemType)GetNextRandomInt(
+                ref GetResamplePrngStream(ref spectralStream.ResampleStream, spectralStream.ResampleKey, resampleCount),
+                0, MotelyEnum<MotelySpectralCard>.ValueCount
+            );
+
+            ++resampleCount;
+        }
     }
 
-    public MotelyItem GetNextSpectral(ref MotelySingleSpectralStream SpectralStream, in MotelySingleItemSet itemSet)
+    public MotelyItem GetNextSpectral(ref MotelySingleSpectralStream spectralStream, in MotelySingleItemSet itemSet)
     {
-        if (SpectralStream.IsSoulBlackHoleable)
+        if (spectralStream.IsSoulBlackHoleable)
         {
-            if (!itemSet.Contains(MotelyItemType.Soul) && GetNextRandom(ref SpectralStream.SoulBlackHolePrngStream) > 0.997)
+            if (!itemSet.Contains(MotelyItemType.Soul) && GetNextRandom(ref spectralStream.SoulBlackHolePrngStream) > 0.997)
             {
                 return MotelyItemType.Soul;
             }
 
-            if (!itemSet.Contains(MotelyItemType.BlackHole) && GetNextRandom(ref SpectralStream.SoulBlackHolePrngStream) > 0.997)
+            if (!itemSet.Contains(MotelyItemType.BlackHole) && GetNextRandom(ref spectralStream.SoulBlackHolePrngStream) > 0.997)
             {
                 return MotelyItemType.BlackHole;
             }
         }
 
-        MotelyItemType Spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard |
-            (MotelyItemType)GetNextRandomInt(ref SpectralStream.ResampleStream.InitialPrngStream, 0, MotelyEnum<MotelySpectralCard>.ValueCount);
+        MotelyItemType spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard |
+            (MotelyItemType)GetNextRandomInt(ref spectralStream.ResampleStream.InitialPrngStream, 0, MotelyEnum<MotelySpectralCard>.ValueCount);
 
         int resampleCount = 0;
 
         while (true)
         {
-            if (!itemSet.Contains(Spectral))
+            if (!itemSet.Contains(spectral) && spectral != MotelyItemType.Soul && spectral != MotelyItemType.BlackHole)
             {
-                return Spectral;
+                return spectral;
             }
 
-            Spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard | (MotelyItemType)GetNextRandomInt(
-                ref GetResamplePrngStream(ref SpectralStream.ResampleStream, SpectralStream.ResampleKey, resampleCount),
+            spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard | (MotelyItemType)GetNextRandomInt(
+                ref GetResamplePrngStream(ref spectralStream.ResampleStream, spectralStream.ResampleKey, resampleCount),
                 0, MotelyEnum<MotelySpectralCard>.ValueCount
             );
 
diff --git a/Motely/Program.cs b/Motely/Program.cs
@@ -16,8 +16,8 @@
     // .WithProviderSearch(new MotelyRandomSeedProvider(2000000000))
     // .WithAdditionalFilter(new LuckyCardFilterDesc())
     // .WithAdditionalFilter(new PerkeoObservatoryFilterDesc())
-    .WithListSearch(["TACO", "DIVA", "7729", "AAAA", "BBBB", "CCCC", "DDDD", "EEEE"])
-    // .WithListSearch(["EEEE"])
+    // .WithListSearch(["TACO", "DIVA", "7729", "AAAA", "BBBB", "CCCC", "DDDD", "EEEE"])
+    .WithListSearch(["ALEEB"])
     // .WithListSearch(["TIQR1111"])
     // .WithStake(MotelyStake.Black)
     .Start();
diff --git a/Motely/filters/TestFilterDesc.cs b/Motely/filters/TestFilterDesc.cs
@@ -29,25 +29,33 @@ public struct TestFilter() : IMotelySeedFilter
         public VectorMask Filter(ref MotelyVectorSearchContext searchContext)
         {
 
-            MotelyVectorJokerStream jokerStream = searchContext.CreateShopJokerStream(1);
+            // MotelyVectorJokerStream jokerStream = searchContext.CreateShopJokerStream(1);
 
-            for (int i = 0; i < 10; i++)
-                Console.WriteLine(searchContext.GetNextJoker(ref jokerStream));
+            // for (int i = 0; i < 10; i++)
+            //     Console.WriteLine(searchContext.GetNextJoker(ref jokerStream));
 
-            return VectorMask.NoBitsSet;
+            // return VectorMask.NoBitsSet;
 
 
-            // return searchContext.SearchIndividualSeeds((ref MotelySingleSearchContext searchContext) =>
-            // {
-            //     Console.WriteLine($"\n{searchContext.GetSeed()}\n");
+            return searchContext.SearchIndividualSeeds((ref MotelySingleSearchContext searchContext) =>
+            {
+                Console.WriteLine($"\n{searchContext.GetSeed()}\n");
 
-            //     MotelySingleJokerStream jokerStream = searchContext.CreateShopJokerStream(1);
+                MotelySingleSpectralStream stream = searchContext.CreateSpectralPackSpectralStream(6);
+                Console.WriteLine(searchContext.GetNextSpectral(ref stream));
 
-            //     for (int i = 0; i < 10; i++)
-            //         Console.WriteLine(searchContext.GetNextJoker(ref jokerStream));
+                // MotelySinglePrngStream blackHoleStream = searchContext.CreatePrngStream(MotelyPrngKeys.SpectralSoulBlackHole + MotelyPrngKeys.Spectral + 6);
 
-            //     return false;
-            // });
+                // Console.WriteLine(searchContext.GetNextRandom(ref blackHoleStream));
+                // Console.WriteLine(searchContext.GetNextRandom(ref blackHoleStream));
+
+                // MotelySingleJokerStream jokerStream = searchContext.CreateShopJokerStream(1);
+
+                // for (int i = 0; i < 10; i++)
+                //     Console.WriteLine(searchContext.GetNextJoker(ref jokerStream));
+
+                return false;
+            });
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -110,39 +110,56 @@ public MotelyItem GetNextSpectral(ref MotelySingleSpectralStream spectralStream)`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`- return (MotelyItemType)MotelyItemTypeCategory.SpectralCard \|`
	`113`	`+ MotelyItemType spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard \|`
`114`	`114`	`(MotelyItemType)GetNextRandomInt(ref spectralStream.ResampleStream.InitialPrngStream, 0, MotelyEnum<MotelySpectralCard>.ValueCount);`
	`115`	`+`
	`116`	`+ int resampleCount = 0;`
	`117`	`+`
	`118`	`+ while (true)`
	`119`	`+ {`
	`120`	`+ if (spectral != MotelyItemType.Soul && spectral != MotelyItemType.BlackHole)`
	`121`	`+ {`
	`122`	`+ return spectral;`
	`123`	`+ }`
	`124`	`+`
	`125`	`+ spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard \| (MotelyItemType)GetNextRandomInt(`
	`126`	`+ ref GetResamplePrngStream(ref spectralStream.ResampleStream, spectralStream.ResampleKey, resampleCount),`
	`127`	`+ 0, MotelyEnum<MotelySpectralCard>.ValueCount`
	`128`	`+ );`
	`129`	`+`
	`130`	`+ ++resampleCount;`
	`131`	`+ }`
`115`	`132`	`}`
`116`	`133`
`117`		`- public MotelyItem GetNextSpectral(ref MotelySingleSpectralStream SpectralStream, in MotelySingleItemSet itemSet)`
	`134`	`+ public MotelyItem GetNextSpectral(ref MotelySingleSpectralStream spectralStream, in MotelySingleItemSet itemSet)`
`118`	`135`	`{`
`119`		`- if (SpectralStream.IsSoulBlackHoleable)`
	`136`	`+ if (spectralStream.IsSoulBlackHoleable)`
`120`	`137`	`{`
`121`		`- if (!itemSet.Contains(MotelyItemType.Soul) && GetNextRandom(ref SpectralStream.SoulBlackHolePrngStream) > 0.997)`
	`138`	`+ if (!itemSet.Contains(MotelyItemType.Soul) && GetNextRandom(ref spectralStream.SoulBlackHolePrngStream) > 0.997)`
`122`	`139`	`{`
`123`	`140`	`return MotelyItemType.Soul;`
`124`	`141`	`}`
`125`	`142`
`126`		`- if (!itemSet.Contains(MotelyItemType.BlackHole) && GetNextRandom(ref SpectralStream.SoulBlackHolePrngStream) > 0.997)`
	`143`	`+ if (!itemSet.Contains(MotelyItemType.BlackHole) && GetNextRandom(ref spectralStream.SoulBlackHolePrngStream) > 0.997)`
`127`	`144`	`{`
`128`	`145`	`return MotelyItemType.BlackHole;`
`129`	`146`	`}`
`130`	`147`	`}`
`131`	`148`
`132`		`- MotelyItemType Spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard \|`
`133`		`- (MotelyItemType)GetNextRandomInt(ref SpectralStream.ResampleStream.InitialPrngStream, 0, MotelyEnum<MotelySpectralCard>.ValueCount);`
	`149`	`+ MotelyItemType spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard \|`
	`150`	`+ (MotelyItemType)GetNextRandomInt(ref spectralStream.ResampleStream.InitialPrngStream, 0, MotelyEnum<MotelySpectralCard>.ValueCount);`
`134`	`151`
`135`	`152`	`int resampleCount = 0;`
`136`	`153`
`137`	`154`	`while (true)`
`138`	`155`	`{`
`139`		`- if (!itemSet.Contains(Spectral))`
	`156`	`+ if (!itemSet.Contains(spectral) && spectral != MotelyItemType.Soul && spectral != MotelyItemType.BlackHole)`
`140`	`157`	`{`
`141`		`- return Spectral;`
	`158`	`+ return spectral;`
`142`	`159`	`}`
`143`	`160`
`144`		`- Spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard \| (MotelyItemType)GetNextRandomInt(`
`145`		`- ref GetResamplePrngStream(ref SpectralStream.ResampleStream, SpectralStream.ResampleKey, resampleCount),`
	`161`	`+ spectral = (MotelyItemType)MotelyItemTypeCategory.SpectralCard \| (MotelyItemType)GetNextRandomInt(`
	`162`	`+ ref GetResamplePrngStream(ref spectralStream.ResampleStream, spectralStream.ResampleKey, resampleCount),`
`146`	`163`	`0, MotelyEnum<MotelySpectralCard>.ValueCount`
`147`	`164`	`);`
`148`	`165`