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

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:
2026-03-01 06:20:23 +07:00
parent 6e19de2f3d
commit 68c4abace3
57 changed files with 2227 additions and 912 deletions
@@ -1,6 +1,6 @@
using UnityEngine;
using YachtDice.Economy;
using YachtDice.Modifiers;
using YachtDice.Modifiers.Runtime;
using YachtDice.Scoring;
namespace YachtDice.Inventory
@@ -23,7 +23,6 @@ namespace YachtDice.Inventory
inventoryView.OnDeactivateClicked += HandleDeactivate;
inventoryView.OnSellClicked += HandleSell;
model.OnActiveModifiersChanged += HandleActiveModifiersChanged;
model.OnInventoryChanged += HandleInventoryChanged;
if (scoringSystem != null)
@@ -42,42 +41,33 @@ namespace YachtDice.Inventory
}
if (model != null)
{
model.OnActiveModifiersChanged -= HandleActiveModifiersChanged;
model.OnInventoryChanged -= HandleInventoryChanged;
}
if (scoringSystem != null)
scoringSystem.OnCategoryConfirmed -= HandleCategoryConfirmed;
}
private void HandleActivate(ModifierRuntime runtime)
private void HandleActivate(ModifierInstance instance)
{
model.TryActivate(runtime);
model.TryActivate(instance);
}
private void HandleDeactivate(ModifierRuntime runtime)
private void HandleDeactivate(ModifierInstance instance)
{
model.Deactivate(runtime);
model.Deactivate(instance);
}
private void HandleSell(ModifierRuntime runtime)
private void HandleSell(ModifierInstance instance)
{
if (runtime.Data == null) return;
if (instance.Definition == null) return;
int sellPrice = runtime.Data.SellPrice;
model.RemoveModifier(runtime);
int sellPrice = instance.Definition.SellPrice;
model.RemoveModifier(instance);
if (currencyBank != null)
currencyBank.Add(sellPrice);
}
private void HandleActiveModifiersChanged(System.Collections.Generic.List<ModifierData> activeModifiers)
{
if (scoringSystem != null)
scoringSystem.SetActiveModifiers(activeModifiers);
}
private void HandleInventoryChanged()
{
RefreshView();