Feature/better input handler

.github/workflows/codeql-analysis.yml

@@ -60,7 +60,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.x
+        dotnet-version: 10.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/dotnet-core.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.x
+        dotnet-version: 10.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/release-creator.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 9.x
+        dotnet-version: 10.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/sonarscan.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up .NET Core
         uses: actions/setup-dotnet@v1
         with: 
-            dotnet-version: 9.x
+            dotnet-version: 10.x
       - name: Set up dotnet coverage
         shell: bash 
         run: |
@@ -51,8 +51,8 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: bash
         run: |
-          dotnet-sonarscanner begin /k:"Sofistico_MagiRogue" /o:"sofistico" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
+          dotnet-sonarscanner begin /k:"Sofistico_MagiRogue" /o:"sofistico" /d:sonar.login="$SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
           dotnet restore
           dotnet build --configuration Release --no-restore
           dotnet-coverage collect 'dotnet test' -f xml  -o 'coverage.xml'
-          dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+          dotnet-sonarscanner end /d:sonar.login="$SONAR_TOKEN"

.vscode/launch.json

@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/src/MagiRogue/bin/Debug/net9.0/MagiRogue.dll",
+            "program": "${workspaceFolder}/src/MagiRogue/bin/Debug/net10.0/MagiRogue.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/MagiRogue",
             "console": "internalConsole",
@@ -20,7 +20,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/src/MagiRogue/bin/Debug/net9.0/MagiRogue.dll",
+            "program": "${workspaceFolder}/src/MagiRogue/bin/Debug/net10.0/MagiRogue.dll",
             "args": ["test"],
             "cwd": "${workspaceFolder}/src/MagiRogue",
             "console": "internalConsole",

.vscode/tasks.json

@@ -7,7 +7,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/MagiRogue.sln",
+                "${workspaceFolder}/MagiRogue.slnx",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary;ForceNoAlign"
             ],
@@ -19,7 +19,7 @@
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/MagiRogue.sln",
+                "${workspaceFolder}/MagiRogue.slnx",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary;ForceNoAlign"
             ],
@@ -38,4 +38,4 @@
             "problemMatcher": "$msCompile"
         }
     ]
-}
+}

MagiRogue.slnx

@@ -0,0 +1,24 @@
+<Solution>
+  <Folder Name="/1 - Game/">
+    <Project Path="src/MagiRogue/MagiRogue.csproj" />
+  </Folder>
+  <Folder Name="/1 - Game/1.1 - Data/">
+    <Project Path="src/AccidentalNoiseLibrary/AccidentalNoiseLibrary.csproj" />
+    <Project Path="src/Arquimedes/Arquimedes.csproj" />
+  </Folder>
+  <Folder Name="/1 - Game/1.2 - Engine/">
+    <Project Path="src/MagusEngine/MagusEngine.csproj" />
+  </Folder>
+  <Folder Name="/1 - Game/1.3 - Render/">
+    <Project Path="src/Diviner/Diviner.csproj" />
+  </Folder>
+  <Folder Name="/2 - Tools/">
+    <Project Path="src/MagiRogue.Benchmarks/MagiRogue.Benchmarks.csproj" />
+    <Project Path="src/MagiRogue.LegendsConsoleViewer/MagiRogue.LegendsConsoleViewer.csproj" />
+  </Folder>
+  <Folder Name="/3 - Test/">
+    <Project Path="src/MagiRogue.Test/MagiRogue.Test.csproj">
+      <BuildDependency Project="src/MagiRogue/MagiRogue.csproj" />
+    </Project>
+  </Folder>
+</Solution>

Makefile

@@ -0,0 +1,8 @@
+build:
+	dotnet build
+
+run:
+	dotnet run --project ./src/MagiRogue -- test 
+
+watch:
+	dotnet watch --project ./src/MagiRogue

README.md

@@ -19,5 +19,3 @@ The game also includes a coven of wizards, with deep master-apprentice relations
 
 As you progress through the game, you can play as an apprentice, honing your magical skills and climbing the ranks to become a powerful archmage. Alternatively, you can choose to abandon magic altogether and live as a common person, or even strive to become a god. The possibilities are endless in MagiRogue, and the choices you make will have a profound impact on your journey through the game.
 
-
-

src/AccidentalNoiseLibrary/AccidentalNoiseLibrary.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Arquimedes/Arquimedes.csproj

@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="SadConsole" Version="10.6.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+		<PackageReference Include="SadConsole" Version="10.8.0" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Arquimedes/Data/Materials/material_body.json

@@ -12,12 +12,12 @@
     "ColdDamageTemp": -56,
     "Color": "Gray",
     "Type": "Skin",
-    "ShearYield": 20000,
-    "ShearFracture": 20000,
-    "ShearStrainAtYield": 50000,
-    "ImpactYield": 10000,
-    "ImpactFracture": 10000,
-    "ImpactStrainsAtYield": 50000
+    "ShearYield": 1000,
+    "ShearFracture": 2000,
+    "ShearStrainAtYield": 25000,
+    "ImpactYield": 500,
+    "ImpactFracture": 1000,
+    "ImpactStrainsAtYield": 25000
   },
   {
     "Id": "fat",
@@ -53,12 +53,12 @@
     "ColdDamageTemp": -56,
     "Color": "Red",
     "Type": "Meat",
-    "ShearYield": 10000,
-    "ShearFracture": 10000,
-    "ShearStrainAtYield": 50000,
-    "ImpactYield": 10000,
-    "ImpactFracture": 10000,
-    "ImpactStrainsAtYield": 50000
+    "ShearYield": 800,
+    "ShearFracture": 1500,
+    "ShearStrainAtYield": 30000,
+    "ImpactYield": 400,
+    "ImpactFracture": 800,
+    "ImpactStrainsAtYield": 30000
   },
   {
     "Id": "bone",
@@ -73,12 +73,12 @@
     "Density": 0.5,
     "Color": "White",
     "Type": "Bone",
-    "ShearYield": 115000,
-    "ShearFracture": 130000,
-    "ShearStrainAtYield": 100,
-    "ImpactYield": 20000,
-    "ImpactFracture": 20000,
-    "ImpactStrainsAtYield": 100,
+    "ShearYield": 50000,
+    "ShearFracture": 80000,
+    "ShearStrainAtYield": 5000,
+    "ImpactYield": 15000,
+    "ImpactFracture": 25000,
+    "ImpactStrainsAtYield": 5000,
     "MaxEdge": 100
   },
   {
@@ -95,7 +95,6 @@
     "Density": 0.6,
     "Color": "White",
     "Type": "Teeth",
-    // same from bone
     "MaxEdge": 1000
   },
   {
@@ -191,7 +190,6 @@
     "Type": "None"
   },
   {
-    // todo: Fix these values
     "Id": "hair",
     "Name": "hair material",
     "InheirtFrom": "skin",
@@ -203,7 +201,6 @@
     "Type": "None"
   },
   {
-    // TODO: to fix this layer
     "Id": "cartilage",
     "Name": "cartilage material",
     "InheirtFrom": "skin",
@@ -258,7 +255,6 @@
     "Density": 0.5,
     "Color": "Gray",
     "Type": "Bone",
-    // more elastic than bone
     "ImpactYield": 200000,
     "ImpactFracture": 200000,
     "ImpactStrainsAtYield": 5000,

src/Arquimedes/Data/Materials/material_metals.json

@@ -8,12 +8,12 @@
     "MeltingPoint": 1538,
     "BoilingPoint": 2862,
     "ConfersTraits": [ "Durable", "MagicallyWeak" ],
-    "ShearYield": 15000,
-    "ShearFracture": 15000,
-    "ShearStrainAtYield": 100,
-    "ImpactYield": 120000,
-    "ImpactFracture": 120000,
-    "ImpactStrainsAtYield": 100,
+    "ShearYield": 80000,
+    "ShearFracture": 120000,
+    "ShearStrainAtYield": 1000,
+    "ImpactYield": 200000,
+    "ImpactFracture": 300000,
+    "ImpactStrainsAtYield": 1000,
     "MaxEdge": 1000
   },
   {