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

[Refactor] Replace enum-driven modifier system with data-driven SO composition

Browse Source 
Replace the entire static, enum-based modifier pipeline with a
composition-based, data-driven architecture using ScriptableObject
polymorphism. New modifiers can now be created by assembling SO building
blocks (Conditions + Effects + Behaviors) — no core code edits needed.

New architecture:
- Core/: TriggerType, ModifierPhase, ModifierContext, ICondition, IEffect
- Definition/: ModifierDefinitionSO, ModifierBehaviorSO, ConditionSO, EffectSO, ModifierCatalogSO
- Conditions/: DieValueCondition, CategoryCondition, MinScoreCondition, DiceCountCondition
- Effects/: AddFlat, AddPerDie, Multiply, MultiplyPerDie, PostMultiply, AddCurrency, ConsumeCharge
- Runtime/: ModifierInstance, ModifierRegistry (non-static service)
- Pipeline/: async ModifierPipeline with phase ordering, tracing, anti-recursion
- Editor/: ModifierDefinitionValidator with menu items
- Events/: GameEventBus (non-static typed dispatcher)
- DI/: GameLifetimeScope (VContainer composition root)

Deleted old system: ModifierData, ModifierEffect, ModifierEnums,
ModifierPipeline (static), ModifierRuntime, ModifierTarget, ShopCatalog,
ModifierAssetCreator.

Updated: ScoringSystem (VContainer + async), InventoryModel (delegates to
ModifierRegistry), ShopModel (uses ModifierDefinitionSO), GameController
(VContainer injection), SaveData (uses Runtime.ModifierSaveEntry), all
views/controllers, and all test files.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Konstantin Dyachenko
2026-03-01 06:20:23 +07:00
parent 6e19de2f3d
commit 68c4abace3
57 changed files with 2227 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Tests/Editor/InventoryModelTests.cs
+23 -21
View File
@@ -1,32 +1,34 @@
using NUnit.Framework;
using UnityEngine;
using YachtDice.Inventory;
using YachtDice.Modifiers;
using YachtDice.Modifiers.Definition;
using YachtDice.Modifiers.Runtime;
namespace YachtDice.Tests
{
public class InventoryModelTests
{
private ModifierRegistry registry;
private InventoryModel inventory;
[SetUp]
public void SetUp()
{
inventory = new InventoryModel(3);
registry = new ModifierRegistry(3);
inventory = new InventoryModel(registry);
}
private ModifierData CreateTestData(string id = "test",
ModifierDurability durability = ModifierDurability.Permanent, int maxUses = 0)
private ModifierDefinitionSO CreateTestDef(string id = "test",
bool hasLimitedUses = false, int maxUses = 0)
{
return ModifierData.CreateForTest(id, ModifierScope.SelectedCategory,
ModifierEffectType.AddFlatToFinalScore, 10f,
durability: durability, maxUses: maxUses);
return ModifierDefinitionSO.CreateForTest(id, null,
hasLimitedUses: hasLimitedUses, maxUses: maxUses);
}
[Test]
public void AddModifier_IncreasesCount()
{
inventory.AddModifier(CreateTestData());
inventory.AddModifier(CreateTestDef());
Assert.AreEqual(1, inventory.OwnedModifiers.Count);
}
@@ -34,7 +36,7 @@ namespace YachtDice.Tests
[Test]
public void TryActivate_SucceedsWithinSlotLimit()
{
inventory.AddModifier(CreateTestData("a"));
inventory.AddModifier(CreateTestDef("a"));
var mod = inventory.OwnedModifiers[0];
bool result = inventory.TryActivate(mod);
@@ -49,11 +51,11 @@ namespace YachtDice.Tests
{
for (int i = 0; i < 3; i++)
{
inventory.AddModifier(CreateTestData($"m{i}"));
inventory.AddModifier(CreateTestDef($"m{i}"));
inventory.TryActivate(inventory.OwnedModifiers[i]);
}
inventory.AddModifier(CreateTestData("extra"));
inventory.AddModifier(CreateTestDef("extra"));
var extra = inventory.OwnedModifiers[3];
bool result = inventory.TryActivate(extra);
@@ -65,7 +67,7 @@ namespace YachtDice.Tests
[Test]
public void Deactivate_FreesSlot()
{
inventory.AddModifier(CreateTestData());
inventory.AddModifier(CreateTestDef());
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
@@ -78,7 +80,7 @@ namespace YachtDice.Tests
[Test]
public void RemoveModifier_DeactivatesAndRemoves()
{
inventory.AddModifier(CreateTestData());
inventory.AddModifier(CreateTestDef());
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
@@ -91,7 +93,7 @@ namespace YachtDice.Tests
[Test]
public void ConsumeUseOnActive_DecrementsUses()
{
inventory.AddModifier(CreateTestData("ltd", ModifierDurability.LimitedUses, 3));
inventory.AddModifier(CreateTestDef("ltd", hasLimitedUses: true, maxUses: 3));
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
@@ -103,7 +105,7 @@ namespace YachtDice.Tests
[Test]
public void ConsumeUseOnActive_RemovesExpired()
{
inventory.AddModifier(CreateTestData("ltd", ModifierDurability.LimitedUses, 1));
inventory.AddModifier(CreateTestDef("ltd", hasLimitedUses: true, maxUses: 1));
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
@@ -115,7 +117,7 @@ namespace YachtDice.Tests
[Test]
public void ConsumeUseOnActive_IgnoresPermanent()
{
inventory.AddModifier(CreateTestData("perm", ModifierDurability.Permanent));
inventory.AddModifier(CreateTestDef("perm"));
var mod = inventory.OwnedModifiers[0];
inventory.TryActivate(mod);
@@ -126,13 +128,13 @@ namespace YachtDice.Tests
}
[Test]
public void GetActiveModifierData_ReturnsOnlyActive()
public void GetActiveModifierDefinitions_ReturnsOnlyActive()
{
inventory.AddModifier(CreateTestData("a"));
inventory.AddModifier(CreateTestData("b"));
inventory.AddModifier(CreateTestDef("a"));
inventory.AddModifier(CreateTestDef("b"));
inventory.TryActivate(inventory.OwnedModifiers[0]);
var active = inventory.GetActiveModifierData();
var active = inventory.GetActiveModifierDefinitions();
Assert.AreEqual(1, active.Count);
}
@@ -150,7 +152,7 @@ namespace YachtDice.Tests
{
bool fired = false;
inventory.OnActiveModifiersChanged += _ => fired = true;
inventory.AddModifier(CreateTestData());
inventory.AddModifier(CreateTestDef());
inventory.TryActivate(inventory.OwnedModifiers[0]);