Further repeatable quest improvements
This commit is contained in:
@@ -74,12 +74,16 @@ public record EliminationTargetPool
|
||||
[JsonPropertyName("bossBoarSniper")]
|
||||
public TargetLocation? BossBoarSniper { get; set; }
|
||||
|
||||
public EliminationTargetPool this[string toLower]
|
||||
public EliminationTargetPool? this[string toLower]
|
||||
{
|
||||
get
|
||||
{
|
||||
return (EliminationTargetPool?)GetType().GetProperties().SingleOrDefault(p => p.GetJsonName() == toLower)?.GetValue(this);
|
||||
}
|
||||
set
|
||||
{
|
||||
// Implement
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -133,13 +133,12 @@ public class ProbabilityObjectArray<T, K, V> : List<T> where T : ProbabilityObje
|
||||
* Drawing can be with or without replacement
|
||||
* @param count The number of times we want to draw
|
||||
* @param replacement Draw with or without replacement from the input dict (true = dont remove after drawing)
|
||||
* @param locklist list keys which shall be replaced even if drawing without replacement
|
||||
* @param lockList list keys which shall be replaced even if drawing without replacement
|
||||
* @returns Array consisting of N random keys for this ProbabilityObjectArray
|
||||
*/
|
||||
public List<K> Draw(int count = 1, bool replacement = true, List<K>? locklist = null)
|
||||
public List<K> Draw(int count = 1, bool replacement = true, List<K>? lockList = null)
|
||||
{
|
||||
if (locklist == null)
|
||||
locklist = new List<K>();
|
||||
lockList ??= [];
|
||||
if (Count == 0)
|
||||
{
|
||||
return [];
|
||||
@@ -163,7 +162,7 @@ public class ProbabilityObjectArray<T, K, V> : List<T> where T : ProbabilityObje
|
||||
var rand = Random.Shared.NextDouble();
|
||||
var randomIndex = (int)probCumsum.First((x) => x > rand);
|
||||
// We cannot put Math.random() directly in the findIndex because then it draws anew for each of its iteration
|
||||
if (replacement || locklist.Contains(totals.keyArray[randomIndex]))
|
||||
if (replacement || lockList.Contains(totals.keyArray[randomIndex]))
|
||||
{
|
||||
// Add random item from possible value into return array
|
||||
drawnKeys.Add(totals.keyArray[randomIndex]);
|
||||
|
||||
@@ -4,9 +4,9 @@ namespace Core.Utils.Extensions
|
||||
{
|
||||
public static class EliminationTargetPoolExtensions
|
||||
{
|
||||
public static void Remove<T>(this EliminationTargetPool pool, T key)
|
||||
public static void Remove(this EliminationTargetPool pool, string key)
|
||||
{
|
||||
// TODO: Implement
|
||||
pool[key] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user