[Refactor] Replace [SerializeField] + getter with [field: SerializeField] auto-properties
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -7,17 +7,14 @@ namespace YachtDice.Modifiers.Definition
|
||||
{
|
||||
public abstract class Effect : ScriptableObject, IEffect
|
||||
{
|
||||
[SerializeField] private ModifierPhase phase = ModifierPhase.Additive;
|
||||
[SerializeField] private int priority;
|
||||
|
||||
public ModifierPhase Phase => phase;
|
||||
public int Priority => priority;
|
||||
[field: SerializeField] public ModifierPhase Phase { get; private set; } = ModifierPhase.Additive;
|
||||
[field: SerializeField] public int Priority { get; private set; }
|
||||
|
||||
public abstract UniTask Apply(ModifierContext context, ModifierInstance instance);
|
||||
|
||||
#if UNITY_EDITOR
|
||||
public void SetPhaseForTest(ModifierPhase p) => phase = p;
|
||||
public void SetPriorityForTest(int p) => priority = p;
|
||||
public void SetPhaseForTest(ModifierPhase p) => Phase = p;
|
||||
public void SetPriorityForTest(int p) => Priority = p;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,11 +8,10 @@ namespace YachtDice.Modifiers.Definition
|
||||
[CreateAssetMenu(fileName = "NewBehavior", menuName = "YachtDice/Modifiers/Behavior")]
|
||||
public class ModifierBehavior : ScriptableObject
|
||||
{
|
||||
[SerializeField] private TriggerType trigger;
|
||||
[field: SerializeField] public TriggerType Trigger { get; private set; }
|
||||
[SerializeField] private List<Condition> conditions = new();
|
||||
[SerializeField] private List<Effect> effects = new();
|
||||
|
||||
public TriggerType Trigger => trigger;
|
||||
public IReadOnlyList<Condition> Conditions => conditions;
|
||||
public IReadOnlyList<Effect> Effects => effects;
|
||||
|
||||
@@ -33,7 +32,7 @@ namespace YachtDice.Modifiers.Definition
|
||||
List<Effect> effects)
|
||||
{
|
||||
var so = CreateInstance<ModifierBehavior>();
|
||||
so.trigger = trigger;
|
||||
so.Trigger = trigger;
|
||||
so.conditions = conditions ?? new List<Condition>();
|
||||
so.effects = effects ?? new List<Effect>();
|
||||
return so;
|
||||
|
||||
@@ -7,35 +7,24 @@ namespace YachtDice.Modifiers.Definition
|
||||
[CreateAssetMenu(fileName = "NewModifier", menuName = "YachtDice/Modifiers/Definition")]
|
||||
public class ModifierDefinition : ScriptableObject
|
||||
{
|
||||
[Header("Identity")]
|
||||
[SerializeField] private string id;
|
||||
[SerializeField] private string displayName;
|
||||
[SerializeField, TextArea] private string description;
|
||||
[SerializeField] private Sprite icon;
|
||||
[SerializeField] private ModifierRarity rarity;
|
||||
[field: Header("Identity")]
|
||||
[field: SerializeField] public string Id { get; private set; }
|
||||
[field: SerializeField] public string DisplayName { get; private set; }
|
||||
[field: SerializeField, TextArea] public string Description { get; private set; }
|
||||
[field: SerializeField] public Sprite Icon { get; private set; }
|
||||
[field: SerializeField] public ModifierRarity Rarity { get; private set; }
|
||||
|
||||
[Header("Economy")]
|
||||
[SerializeField] private int shopPrice;
|
||||
[SerializeField] private int sellPrice;
|
||||
[field: Header("Economy")]
|
||||
[field: SerializeField] public int ShopPrice { get; private set; }
|
||||
[field: SerializeField] public int SellPrice { get; private set; }
|
||||
|
||||
[Header("Durability")]
|
||||
[SerializeField] private bool hasLimitedUses;
|
||||
[SerializeField] private int maxUses;
|
||||
[SerializeField] private int maxStacks = 1;
|
||||
[field: Header("Durability")]
|
||||
[field: SerializeField] public bool HasLimitedUses { get; private set; }
|
||||
[field: SerializeField] public int MaxUses { get; private set; }
|
||||
[field: SerializeField] public int MaxStacks { get; private set; } = 1;
|
||||
|
||||
[Header("Behaviors")]
|
||||
[SerializeField] private List<ModifierBehavior> behaviors = new();
|
||||
|
||||
public string Id => id;
|
||||
public string DisplayName => displayName;
|
||||
public string Description => description;
|
||||
public Sprite Icon => icon;
|
||||
public ModifierRarity Rarity => rarity;
|
||||
public int ShopPrice => shopPrice;
|
||||
public int SellPrice => sellPrice;
|
||||
public bool HasLimitedUses => hasLimitedUses;
|
||||
public int MaxUses => maxUses;
|
||||
public int MaxStacks => maxStacks;
|
||||
public IReadOnlyList<ModifierBehavior> Behaviors => behaviors;
|
||||
|
||||
#if UNITY_EDITOR
|
||||
@@ -49,14 +38,14 @@ namespace YachtDice.Modifiers.Definition
|
||||
ModifierRarity rarity = ModifierRarity.Common)
|
||||
{
|
||||
var so = CreateInstance<ModifierDefinition>();
|
||||
so.id = id;
|
||||
so.displayName = id;
|
||||
so.description = id;
|
||||
so.rarity = rarity;
|
||||
so.shopPrice = shopPrice;
|
||||
so.sellPrice = sellPrice;
|
||||
so.hasLimitedUses = hasLimitedUses;
|
||||
so.maxUses = maxUses;
|
||||
so.Id = id;
|
||||
so.DisplayName = id;
|
||||
so.Description = id;
|
||||
so.Rarity = rarity;
|
||||
so.ShopPrice = shopPrice;
|
||||
so.SellPrice = sellPrice;
|
||||
so.HasLimitedUses = hasLimitedUses;
|
||||
so.MaxUses = maxUses;
|
||||
so.behaviors = behaviors ?? new List<ModifierBehavior>();
|
||||
return so;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user