horooko/YachtDice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Code visual

Browse Source
This commit is contained in:
Konstantin Dyachenko
2026-02-28 19:25:26 +07:00
parent bee20fd1f8
commit e24b30743b
39 changed files with 2611 additions and 2687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Modifiers/ModifierPipeline.cs
+52 -53
View File
@@ -3,65 +3,64 @@ using YachtDice.Scoring;
namespace YachtDice.Modifiers
{
public static class ModifierPipeline
{
// Application order (explicit):
// 1. Category-level additive (AddPerDieValue)
// 2. Category-level multiplicative (MultiplyPerDieValue)
// 3. Final-score additive (AddFlatToFinalScore)
// 4. Final-score multiplicative (MultiplyFinalScore)
public static void Apply(
IReadOnlyList<ModifierData> activeModifiers,
ref ScoreResult result,
ModifierScope currentScope)
public static class ModifierPipeline
{
if (activeModifiers == null) return;
// Application order (explicit):
// 1. Category-level additive (AddPerDieValue)
// 2. Category-level multiplicative (MultiplyPerDieValue)
// 3. Final-score additive (AddFlatToFinalScore)
// 4. Final-score multiplicative (MultiplyFinalScore)
// Pass 1: Category-level additive
for (int i = 0; i < activeModifiers.Count; i++)
public static void Apply(
IReadOnlyList<ModifierData> activeModifiers,
ref ScoreResult result,
ModifierScope currentScope)
{
var mod = activeModifiers[i];
if (!ShouldApply(mod, ref result, currentScope)) continue;
if (mod.IsCategoryLevel && mod.IsAdditive)
ModifierEffect.Apply(mod, ref result);
if (activeModifiers == null) return;
// Pass 1: Category-level additive
for (int i = 0; i < activeModifiers.Count; i++)
{
var mod = activeModifiers[i];
if (!ShouldApply(mod, ref result, currentScope)) continue;
if (mod.IsCategoryLevel && mod.IsAdditive)
ModifierEffect.Apply(mod, ref result);
}
// Pass 2: Category-level multiplicative
for (int i = 0; i < activeModifiers.Count; i++)
{
var mod = activeModifiers[i];
if (!ShouldApply(mod, ref result, currentScope)) continue;
if (mod.IsCategoryLevel && mod.IsMultiplicative)
ModifierEffect.Apply(mod, ref result);
}
// Pass 3: Final-score additive
for (int i = 0; i < activeModifiers.Count; i++)
{
var mod = activeModifiers[i];
if (!ShouldApply(mod, ref result, currentScope)) continue;
if (mod.IsFinalScoreLevel && mod.IsAdditive)
ModifierEffect.Apply(mod, ref result);
}
// Pass 4: Final-score multiplicative
for (int i = 0; i < activeModifiers.Count; i++)
{
var mod = activeModifiers[i];
if (!ShouldApply(mod, ref result, currentScope)) continue;
if (mod.IsFinalScoreLevel && mod.IsMultiplicative)
ModifierEffect.Apply(mod, ref result);
}
}
// Pass 2: Category-level multiplicative
for (int i = 0; i < activeModifiers.Count; i++)
private static bool ShouldApply(ModifierData mod, ref ScoreResult result, ModifierScope currentScope)
{
var mod = activeModifiers[i];
if (!ShouldApply(mod, ref result, currentScope)) continue;
if (mod.IsCategoryLevel && mod.IsMultiplicative)
ModifierEffect.Apply(mod, ref result);
}
// Pass 3: Final-score additive
for (int i = 0; i < activeModifiers.Count; i++)
{
var mod = activeModifiers[i];
if (!ShouldApply(mod, ref result, currentScope)) continue;
if (mod.IsFinalScoreLevel && mod.IsAdditive)
ModifierEffect.Apply(mod, ref result);
}
// Pass 4: Final-score multiplicative
for (int i = 0; i < activeModifiers.Count; i++)
{
var mod = activeModifiers[i];
if (!ShouldApply(mod, ref result, currentScope)) continue;
if (mod.IsFinalScoreLevel && mod.IsMultiplicative)
ModifierEffect.Apply(mod, ref result);
if (mod == null) return false;
if (mod.Scope != currentScope) return false;
if (mod.Target.HasCategoryFilter && mod.Target.TargetCategory != result.Category) return false;
return true;
}
}
private static bool ShouldApply(ModifierData mod, ref ScoreResult result, ModifierScope currentScope)
{
if (mod == null) return false;
if (mod.Scope != currentScope) return false;
if (mod.Target.HasCategoryFilter && mod.Target.TargetCategory != result.Category) return false;
return true;
}
}
}