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

[Fix] Naming

Browse Source
This commit is contained in:
Konstantin Dyachenko
2026-03-01 11:52:15 +07:00
parent 0f9b162061
commit 6c10a35bf9
34 changed files with 133 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Scoring/ScoreResult.cs
+2 -2
View File
@@ -13,11 +13,11 @@ namespace YachtDice.Scoring
public int FlatBonus;
public float Multiplier;
public int[] DiceValues;
public CategoryDefinitionSO Category;
public CategoryDefinition Category;
public int FinalScore => Mathf.FloorToInt((BaseScore + FlatBonus) * Multiplier);
public static ScoreResult Create(int baseScore, IReadOnlyList<IDie> dice, CategoryDefinitionSO category)
public static ScoreResult Create(int baseScore, IReadOnlyList<IDie> dice, CategoryDefinition category)
{
return new ScoreResult
{
Assets/Scripts/Scoring/ScoringSystem.cs
+12 -12
View File
@@ -13,30 +13,30 @@ namespace YachtDice.Scoring
{
public class ScoringSystem : MonoBehaviour
{
public event Action<CategoryDefinitionSO, int> OnCategoryScored;
public event Action<CategoryDefinition, int> OnCategoryScored;
public event Action<int> OnAllCategoriesScored;
public event Action<CategoryDefinitionSO, ScoreResult> OnCategoryConfirmed;
public event Action<CategoryDefinition, ScoreResult> OnCategoryConfirmed;
private readonly Dictionary<CategoryDefinitionSO, int> scorecard = new();
private readonly HashSet<CategoryDefinitionSO> usedCategories = new();
private readonly Dictionary<CategoryDefinition, int> scorecard = new();
private readonly HashSet<CategoryDefinition> usedCategories = new();
private GameEventBus eventBus;
private ModifierRegistry modifierRegistry;
private CategoryCatalogSO catalog;
private CategoryCatalog catalog;
[Inject]
public void Construct(GameEventBus eventBus, ModifierRegistry modifierRegistry, CategoryCatalogSO catalog)
public void Construct(GameEventBus eventBus, ModifierRegistry modifierRegistry, CategoryCatalog catalog)
{
this.eventBus = eventBus;
this.modifierRegistry = modifierRegistry;
this.catalog = catalog;
}
public CategoryCatalogSO Catalog => catalog;
public CategoryCatalog Catalog => catalog;
public bool IsCategoryUsed(CategoryDefinitionSO category) => usedCategories.Contains(category);
public bool IsCategoryUsed(CategoryDefinition category) => usedCategories.Contains(category);
public int GetCategoryScore(CategoryDefinitionSO category)
public int GetCategoryScore(CategoryDefinition category)
{
return scorecard.TryGetValue(category, out int score) ? score : -1;
}
@@ -57,7 +57,7 @@ namespace YachtDice.Scoring
public bool IsComplete => CategoriesFilledCount >= TotalCategoryCount;
public ScoreResult PreviewScore(IReadOnlyList<IDie> dice, CategoryDefinitionSO category,
public ScoreResult PreviewScore(IReadOnlyList<IDie> dice, CategoryDefinition category,
int currentRoll = 0, int currentTurn = 0, int playerCurrency = 0)
{
int baseScore = category.Calculate(dice);
@@ -75,7 +75,7 @@ namespace YachtDice.Scoring
return context.ToScoreResult();
}
public async UniTask<ScoreResult> ScoreCategoryAsync(IReadOnlyList<IDie> dice, CategoryDefinitionSO category,
public async UniTask<ScoreResult> ScoreCategoryAsync(IReadOnlyList<IDie> dice, CategoryDefinition category,
int currentRoll, int currentTurn, int playerCurrency)
{
if (usedCategories.Contains(category))
@@ -118,7 +118,7 @@ namespace YachtDice.Scoring
return result;
}
public ScoreResult ScoreCategory(IReadOnlyList<IDie> dice, CategoryDefinitionSO category)
public ScoreResult ScoreCategory(IReadOnlyList<IDie> dice, CategoryDefinition category)
{
if (usedCategories.Contains(category))
throw new InvalidOperationException($"Category {category.DisplayName} has already been scored.");