Split into UI and Core projects

Author: CorruptComputer

.github/actions/setup-env/action.yml

@@ -0,0 +1,16 @@
+name: setup-env
+description: Setup Environment
+
+runs:
+  using: composite
+  steps:
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '10.0.x'
+
+    - name: Print .NET version and SDKs
+      shell: bash
+      run: |
+        dotnet --version
+        dotnet --list-sdks

.github/workflows/dotnetcore.yml

@@ -9,9 +9,6 @@ on:
       - '*'
   workflow_dispatch:
 
-env:
-  DOTNET_VERSION: '8.0.x'
-
 jobs:
   test:
     name: Test
@@ -21,10 +18,8 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v6
 
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
+      - name: Setup Environment
+        uses: ./.github/actions/setup-env
 
       # Test
       - name: Unit Tests
@@ -39,10 +34,9 @@ jobs:
       # Setup
       - name: Checkout repo
         uses: actions/checkout@v6
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
+
+      - name: Setup Environment
+        uses: ./.github/actions/setup-env
 
       # Build
       - name: Build
@@ -63,10 +57,9 @@ jobs:
       # Setup
       - name: Checkout repo
         uses: actions/checkout@v6
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
+
+      - name: Setup Environment
+        uses: ./.github/actions/setup-env
 
       # Build
       - name: Build

BaldersGait.Core/AssemblyInfo.cs

@@ -0,0 +1,4 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("BaldersGait.Core.UnitTests")]
+[assembly: InternalsVisibleTo("BaldersGait.UI.UnitTests")]

BaldersGait.Core/BaldersGait.Core.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Autofac" Version="9.0.0" />
+    <PackageReference Include="Serilog" Version="4.3.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+    <PackageReference Include="System.Reactive" Version="6.1.0" />
+  </ItemGroup>
+
+</Project>

BaldersGait/BaldersGaitModule.cs BaldersGait.Core/BaldersGaitCoreModule.csBaldersGait/BaldersGaitModule.cs renamed to BaldersGait.Core/BaldersGaitCoreModule.cs

@@ -1,14 +1,15 @@
 using Autofac;
-using BaldersGait.Services;
-using BaldersGait.Services.Interface;
+using BaldersGait.Core.Services.Interface;
+using BaldersGait.Core.Services;
 
-namespace BaldersGait;
+namespace BaldersGait.Core;
 
 /// <summary>
 ///   Main module for the game, things get registered with Autofac here.
 /// </summary>
-public class BaldersGaitModule : Module
+public class BaldersGaitCoreModule : Module
 {
+    /// <inheritdoc />
     protected override void Load(ContainerBuilder builder)
     {
         //builder.RegisterType<HttpClient>().SingleInstance();
@@ -23,4 +24,4 @@ protected override void Load(ContainerBuilder builder)
         builder.RegisterAssemblyTypes(ThisAssembly)
             .Where(t => t.Name.EndsWith("ViewModel"));
     }
-}
+}

BaldersGait.Core/BaldersGaitException.cs

@@ -0,0 +1,30 @@
+using System.Runtime.CompilerServices;
+using Serilog;
+
+namespace BaldersGait.Core;
+
+/// <summary>
+///   Oh no, an error happened!
+/// </summary>
+public class BaldersGaitException : Exception
+{
+    /// <summary>
+    ///   Flag for if the error that happened is recoverable from.
+    /// </summary>
+    public bool SaveRecoverable { get; init; }
+
+    /// <summary>
+    ///   Initializes a new instance of the <see cref="BaldersGaitException"/> class.
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="saveRecoverable"></param>
+    /// <param name="thrownBy"></param>
+    /// <param name="thrownAt"></param>
+    public BaldersGaitException(string message, bool saveRecoverable, [CallerMemberName] string thrownBy = "", [CallerLineNumber] int thrownAt = 0)
+        : base(message)
+    {
+        SaveRecoverable = saveRecoverable;
+
+        Log.Error($"{thrownBy}:{thrownAt}: {message}");
+    }
+}

BaldersGait.Core/Consts/GameStateConsts.cs

@@ -0,0 +1,22 @@
+namespace BaldersGait.Core.Consts;
+
+/// <summary>
+///   Constants related to the game state
+/// </summary>
+public class GameStateConsts
+{
+    /// <summary>
+    ///   The max number of V1 upgrades for hair growth
+    /// </summary>
+    public const int HairGrowthV1UpgradesMax = 15;
+
+    /// <summary>
+    ///   The max number of V1 upgrades for the scaling factor
+    /// </summary>
+    public const int ScalingFactorV1UpgradesMax = 8;
+
+    /// <summary>
+    ///   The max number of V1 upgrades for max hair length
+    /// </summary>
+    public const int MaxHairV1UpgradesMax = 2;
+}

BaldersGait.Core/Models/CalculatedState/CalculatedGameState.cs

@@ -0,0 +1,63 @@
+using BaldersGait.Core.Consts;
+using BaldersGait.Core.Models.SavedState;
+
+namespace BaldersGait.Core.Models.CalculatedState;
+
+/// <summary>
+///   Game state thats calculated at runtime, nothing in here is saved
+/// </summary>
+public sealed class CalculatedGameState
+{
+    /// <summary>
+    ///   ctor
+    /// </summary>
+    /// <param name="savedGameState"></param>
+    public CalculatedGameState(SavedGameState savedGameState)
+    {
+        Update(savedGameState);
+    }
+
+    /// <summary>
+    ///   The base hair per tick before chair scaling modifiers
+    /// </summary>
+    public double BaseHairPerTick { get; private set; }
+
+    /// <summary>
+    ///   Should money be visible in the UI?
+    /// </summary>
+    public bool IsMoneyVisible { get; private set; }
+
+    /// <summary>
+    ///   Should the wig shop button be visible in the UI?
+    /// </summary>
+    public bool IsWigShopButtonVisible { get; private set; }
+
+    /// <summary>
+    ///   Are the hair growth V1 upgrades maxed out?
+    /// </summary>
+    public bool IsHairGrowthV1UpgradesMaxed { get; private set; }
+
+    /// <summary>
+    ///   Are the scaling factor V1 upgrades maxed out?
+    /// </summary>
+    public bool IsScalingFactorV1UpgradesMaxed { get; private set; }
+
+    /// <summary>
+    ///   Are the max hair V1 upgrades maxed out?
+    /// </summary>
+    public bool IsMaxHairV1UpgradesMaxed { get; private set; }
+
+    /// <summary>
+    ///   Updates the calculated state with the current saved game state
+    /// </summary>
+    /// <param name="savedGameState"></param>
+    public void Update(SavedGameState savedGameState)
+    {
+        BaseHairPerTick = Math.Round(0.01 * (savedGameState.HairGrowthV1Upgrades + 1), 3); ;
+        IsMoneyVisible = savedGameState.CompanyPurchased;
+        IsWigShopButtonVisible = savedGameState.CompanyPurchased;
+        IsHairGrowthV1UpgradesMaxed = savedGameState.HairGrowthV1Upgrades >= GameStateConsts.HairGrowthV1UpgradesMax;
+        IsScalingFactorV1UpgradesMaxed = savedGameState.ScalingFactorV1Upgrades >= GameStateConsts.ScalingFactorV1UpgradesMax;
+        IsMaxHairV1UpgradesMaxed = savedGameState.MaxHairV1Upgrades >= GameStateConsts.MaxHairV1UpgradesMax;
+    }
+}

BaldersGait.Core/Models/Enums/ButtonTypes.cs

@@ -0,0 +1,17 @@
+namespace BaldersGait.Core.Models.Enums;
+
+/// <summary>
+///   The type of button in the UI
+/// </summary>
+public enum ButtonTypes
+{
+    /// <summary>
+    ///   Should open a different panel within the application
+    /// </summary>
+    Panel,
+
+    /// <summary>
+    ///   Should open a link in the users browser
+    /// </summary>
+    Link
+}

BaldersGait.Core/Models/Enums/ChairNumbers.cs

@@ -0,0 +1,54 @@
+using System.Text.Json.Serialization;
+
+namespace BaldersGait.Core.Models.Enums;
+
+/// <summary>
+///   There are 8 chairs in the game, each will have its own number, this just makes it easier to refer to them.
+/// </summary>
+public enum ChairNumbers
+{
+    /// <summary>
+    ///   Some kind of error happened, this is just here for the enum default.
+    /// </summary>
+    Unknown = 0,
+
+    /// <summary>
+    ///   Chair one
+    /// </summary>
+    One = 1,
+
+    /// <summary>
+    ///   Chair two
+    /// </summary>
+    Two = 2,
+
+    /// <summary>
+    ///   Chair three
+    /// </summary>
+    Three = 3,
+
+    /// <summary>
+    ///   Chair four
+    /// </summary>
+    Four = 4,
+
+    /// <summary>
+    ///   Chair five
+    /// </summary>
+    Five = 5,
+
+    /// <summary>
+    ///   Chair six
+    /// </summary>
+    Six = 6,
+
+    /// <summary>
+    ///   Chair seven
+    /// </summary>
+    Seven = 7,
+
+    /// <summary>
+    ///   Chair eight
+    /// </summary>
+    Eight = 8
+}