Merge pull request #7 from chickensoft-games/feat/refactor-state

refactor: detangle application and game state

.editorconfig

@@ -470,3 +470,7 @@ dotnet_diagnostic.IDE0046.severity = none
 dotnet_diagnostic.IDE0022.severity = none
 # Don't use collection shorhand.
 dotnet_diagnostic.IDE0300.severity = none
+dotnet_diagnostic.IDE0028.severity = none
+dotnet_diagnostic.IDE0305.severity = none
+# Don't make me populate a switch expression redundantly
+dotnet_diagnostic.IDE0072.severity = none

.vscode/settings.json

@@ -1,9 +1,9 @@
 {
   "[csharp]": {
     "editor.codeActionsOnSave": {
-      "source.addMissingImports": true,
-      "source.fixAll": true,
-      "source.organizeImports": true
+      "source.addMissingImports": "explicit",
+      "source.fixAll": "explicit",
+      "source.organizeImports": "explicit"
     },
     "editor.formatOnPaste": true,
     "editor.formatOnSave": true,

GameDemo.csproj

@@ -27,24 +27,24 @@
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
     <!-- Test dependencies go here! -->
     <!-- Dependencies added here will not be included in release builds. -->
-    <PackageReference Include="Chickensoft.GoDotTest" Version="1.3.2-godot4.2.0-beta.5" />
+    <PackageReference Include="Chickensoft.GoDotTest" Version="1.3.2-godot4.2.0-beta.5"/>
     <!-- Used to drive test scenes when testing visual code -->
-    <PackageReference Include="GodotTestDriver" Version="2.1.0" />
+    <PackageReference Include="GodotTestDriver" Version="2.1.0"/>
     <!-- Bring your own assertion library for tests! -->
     <!-- We're using Shouldly for this example, but you can use anything. -->
-    <PackageReference Include="Shouldly" Version="4.2.1" />
-    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="Shouldly" Version="4.2.1"/>
+    <PackageReference Include="Moq" Version="4.20.69"/>
   </ItemGroup>
   <ItemGroup>
     <!-- Production dependencies go here! -->
-    <PackageReference Include="Chickensoft.SuperNodes" Version="1.6.1" PrivateAssets="all" OutputItemType="analyzer" />
-    <PackageReference Include="Chickensoft.SuperNodes.Types" Version="1.6.1" />
-    <PackageReference Include="Chickensoft.AutoInject" Version="1.5.0" PrivateAssets="all" />
-    <PackageReference Include="Chickensoft.PowerUps" Version="3.0.1-godot4.2.0-beta.5" PrivateAssets="all" />
-    <PackageReference Include="Chickensoft.LogicBlocks" Version="4.0.0" />
-    <PackageReference Include="Chickensoft.LogicBlocks.Generator" Version="4.0.0" PrivateAssets="all" OutputItemType="analyzer" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.1.1" PrivateAssets="all" OutputItemType="analyzer" />
-    <PackageReference Include="Chickensoft.GoDotCollections" Version="1.4.0" />
-    <PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.1.0-godot4.2.0-beta.5 " />
+    <PackageReference Include="Chickensoft.SuperNodes" Version="1.6.1" PrivateAssets="all" OutputItemType="analyzer"/>
+    <PackageReference Include="Chickensoft.SuperNodes.Types" Version="1.6.1"/>
+    <PackageReference Include="Chickensoft.AutoInject" Version="1.5.0" PrivateAssets="all"/>
+    <PackageReference Include="Chickensoft.PowerUps" Version="3.0.1-godot4.2.0-beta.5" PrivateAssets="all"/>
+    <PackageReference Include="Chickensoft.LogicBlocks" Version="4.2.1"/>
+    <PackageReference Include="Chickensoft.LogicBlocks.Generator" Version="4.2.1" PrivateAssets="all" OutputItemType="analyzer"/>
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.1.1" PrivateAssets="all" OutputItemType="analyzer"/>
+    <PackageReference Include="Chickensoft.GoDotCollections" Version="1.4.0"/>
+    <PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.1.0-godot4.2.0-beta.5"/>
   </ItemGroup>
 </Project>

Properties/launchSettings.json

@@ -0,0 +1,16 @@
+{
+  "profiles": {
+    "🕹 Debug Game": {
+      "commandName": "Executable",
+      "executablePath": "%GODOT%",
+      "workingDirectory": "$(SolutionDir)",
+      "commandLineArgs": "--path \"$(ProjectDir)\""
+    },
+    "🧪 Debug Tests": {
+      "commandName": "Executable",
+      "executablePath": "%GODOT%",
+      "workingDirectory": "$(SolutionDir)",
+      "commandLineArgs": "--path \"$(ProjectDir)\" --run-tests --quit-on-finish"
+    }
+  }
+}

README.md

@@ -91,6 +91,10 @@ Since we're using [LogicBlocks], here's some of the more interesting state diagr
 
 ![Application State Diagram](docs/app.png)
 
+### Game State
+
+![Game State Diagram](docs/game.png)
+
 ### Player State
 
 ![Player State Diagram](docs/player.png)
@@ -103,10 +107,6 @@ Since we're using [LogicBlocks], here's some of the more interesting state diagr
 
 ![Jumpshroom State Diagram](docs/jumpshroom.png)
 
-### Game State
-
-![Game State Diagram](docs/game.png)
-
 ---
 
 🐣 Package generated from a 🐤 Chickensoft Template — <https://chickensoft.games>

coverage.sh

@@ -33,6 +33,7 @@ coverlet \
   --exclude-by-file "**/test/**/*.cs" \
   --exclude-by-file "**/*Microsoft.NET.Test.Sdk.Program.cs" \
   --exclude-by-file "**/Godot.SourceGenerators/**/*.cs" \
+  --exclude-by-file "**/Chickensoft.Magic.*/**/*.cs" \
   --exclude-by-file "**/*.g.cs" \
   --exclude-assemblies-without-sources "missingall" \
   --skipautoprops

cspell.json

@@ -20,60 +20,37 @@
     "project.godot"
   ],
   "words": [
-    "skipautoprops",
-    "mipmap",
-    "smoothstep",
-    "triplanar",
-    "samp",
-    "voronoi",
-    "inigo",
-    "quilez",
-    "eyedir",
-    "roystan",
+    "jumpshroom",
+    "assemblyfilters",
     "bastiaan",
-    "modelview",
-    "shadertoy",
-    "martijn",
-    "steinrucken",
-    "twopi",
-    "hoskins",
     "binormal",
-    "fragcoord",
-    "changement",
-    "olij's",
-    "enduml",
-    "startuml",
-    "xcums",
-    "maxwo",
-    "RGBA",
-    "mipmaps",
-    "prepass",
-    "schlick",
-    "fract",
-    "callv",
-    "heightmap",
-    "onready",
-    "multimesh",
-    "randfn",
-    "randf",
-    "deadzone",
-    "joypad",
-    "assemblyfilters",
     "binutils",
     "branchcoverage",
+    "callv",
     "camelcase",
+    "changement",
     "chickengame",
     "Chickensoft",
     "classfilters",
     "Cmdline",
     "cooldown",
     "CYGWIN",
+    "deadzone",
     "endregion",
+    "enduml",
+    "eyedir",
+    "fract",
+    "fragcoord",
+    "gameplay",
     "gdshader",
     "globaltool",
     "godotengine",
+    "heightmap",
+    "hoskins",
+    "inigo",
     "Instantiator",
     "issuecomment",
+    "joypad",
     "Jumpshroom",
     "Killable",
     "kisak",
@@ -82,41 +59,66 @@
     "lerping",
     "lihop",
     "linecoverage",
+    "martijn",
     "Mathf",
+    "maxwo",
     "methodcoverage",
+    "mipmap",
+    "mipmaps",
     "missingall",
+    "modelview",
     "msbuild",
     "MSYS",
+    "multimesh",
     "nameof",
     "netstandard",
     "NOLOGO",
     "nupkg",
+    "olij's",
     "Omnisharp",
+    "onready",
     "opencover",
     "opengl",
     "OPTOUT",
     "Orthonormalized",
     "paramref",
     "pascalcase",
+    "prepass",
+    "quilez",
+    "randf",
+    "randfn",
     "renovatebot",
     "reportgenerator",
     "reporttypes",
+    "RGBA",
+    "roystan",
+    "samp",
+    "schlick",
+    "shadertoy",
     "Shouldly",
     "Shroom",
+    "skipautoprops",
     "Slerp",
+    "smoothstep",
     "spacebar",
+    "startuml",
+    "steinrucken",
     "subfolders",
     "substate",
     "targetargs",
     "targetdir",
+    "triplanar",
     "tscn",
     "tweens",
+    "twopi",
     "typeof",
     "typeparam",
     "typeparamref",
     "ulong",
+    "voronoi",
     "vulkan",
     "WASD",
+    "xcums",
     "Xunit"
   ]
 }