Refactoring game logic

Zennysoft.Game.Ma/src/game/Game.cs

@@ -80,8 +80,6 @@ public partial class Game : Node3D, IGame
 
   private EffectService _effectService;
 
-  private double _expRate = 1;
-
   public void Setup()
   {
     _container = new SimpleInjector.Container();
@@ -194,13 +192,15 @@ public partial class Game : Node3D, IGame
       .Handle((in GameLogic.Output.ShowFloorClearMenu _) => { FloorClearMenu.Show(); FloorClearMenu.FadeIn(); })
       .Handle((in GameLogic.Output.ExitFloorClearMenu _) => { FloorClearMenu.FadeOut(); })
       .Handle((in GameLogic.Output.OpenInventory _) => { InGameUI.ShowInventoryScreen(); InGameUI.InventoryMenu.SetProcessInput(true); })
-      .Handle((in GameLogic.Output.HideInventory _) => { InGameUI.HideInventoryScreen(); InGameUI.InventoryMenu.SetProcessInput(false); })
+      .Handle((in GameLogic.Output.CloseInventory _) => { InGameUI.HideInventoryScreen(); InGameUI.InventoryMenu.SetProcessInput(false); })
       .Handle((in GameLogic.Output.ShowMiniMap _) => { InGameUI.ShowMiniMap(); })
       .Handle((in GameLogic.Output.HideMiniMap _) => { InGameUI.HideMiniMap(); })
       .Handle((in GameLogic.Output.ShowAskForTeleport _) => { GameRepo.Pause(); InGameUI.UseTeleportPrompt.FadeIn(); InGameUI.SetProcessInput(true); })
       .Handle((in GameLogic.Output.HideAskForTeleport _) => { GameRepo.Resume(); InGameUI.UseTeleportPrompt.FadeOut(); InGameUI.SetProcessInput(false); })
       .Handle((in GameLogic.Output.ShowLostScreen _) => { DeathMenu.Show(); DeathMenu.FadeIn(); })
       .Handle((in GameLogic.Output.ExitLostScreen _) => { DeathMenu.FadeOut(); })
+      .Handle((in GameLogic.Output.AnnounceMessage output) => { AnnounceMessageOnMainScreen(output.Message); })
+      .Handle((in GameLogic.Output.DoubleExpTimeStart output) => { DoubleEXPTimer.WaitTime = output.lengthOfTimeInSeconds; DoubleEXPTimer.Start(); })
       .Handle((in GameLogic.Output.SaveGame _) =>
       {
         SaveFile.Save();
@@ -284,9 +284,6 @@ public partial class Game : Node3D, IGame
     {
       switch (effectItem.UsableItemTag)
       {
-        case UsableItemTag.DoubleEXP:
-          DoubleEXP(TimeSpan.FromSeconds(30));
-          break;
         case UsableItemTag.TeleportAllEnemiesToRoom:
           _effectService.TeleportEnemiesToCurrentRoom();
           break;
@@ -324,6 +321,9 @@ public partial class Game : Node3D, IGame
     }
     if (item is ThrowableItem throwableItem)
     {
+      if (throwableItem.ThrowableItemTag == ThrowableItemTag.DoubleExp)
+        GameRepo.StartDoubleEXP(TimeSpan.FromSeconds(30));
+
       if (throwableItem.HealHPAmount > 0)
         Player.HealHP(throwableItem.HealHPAmount);
       if (throwableItem.HealVTAmount > 0)
@@ -373,7 +373,7 @@ public partial class Game : Node3D, IGame
 
   public void EnemyDefeated(Vector3 defeatedLocation, EnemyStatResource resource)
   {
-    Player.GainExp(resource.ExpFromDefeat * _expRate);
+    Player.GainExp(resource.ExpFromDefeat * GameRepo.ExpRate);
   }
 
   private void DropRestorative(Vector3 vector)
@@ -441,19 +441,9 @@ public partial class Game : Node3D, IGame
       GetTree().Paused = isPaused;
   }
 
-  public async void DoubleEXP(TimeSpan lengthOfEffect)
-  {
-    ToggleInventory();
-    AnnounceMessageOnMainScreen("Experience points temporarily doubled.");
-    DoubleEXPTimer.Start(lengthOfEffect.Seconds);
-    _expRate = 2;
-  }
-
   private void DoubleEXPTimer_Timeout()
   {
-    DoubleEXPTimer.Stop();
-    _expRate = 1;
-    AnnounceMessageOnMainScreen("Experience points effect wore off.");
+    GameRepo.EndDoubleExp();
   }
 
   private void InventoryMenu_CloseInventory() => GameLogic.Input(new GameLogic.Input.CloseInventory());

Zennysoft.Game.Ma/src/game/IGame.cs

@@ -26,8 +26,6 @@ public interface IGame : IProvide<IGameRepo>, IProvide<IGameEventDepot>, IProvid
 
   public void ThrowItem(InventoryItem item);
 
-  public void DoubleEXP(TimeSpan lengthOfEffect);
-
   public void ToggleInventory();
 
   public void ToggleMinimap();

Zennysoft.Game.Ma/src/items/throwable/resources/SpellSignKnowledge.tres

@@ -5,8 +5,9 @@
 
 [resource]
 script = ExtResource("1_s3pq7")
-ThrowableItemTags = Array[int]([])
-UsableItemTags = Array[int]([0])
+ThrowableItemTag = 1
+ElementType = 0
+UsableItemTag = 0
 Name = "Spell Sign: Knowledge"
 Description = "Doubles experience points earned. Effect is temporary."
 Texture = ExtResource("1_3605p")
@@ -15,3 +16,4 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
+ItemTag = 0

Zennysoft.Game.Ma/src/map/dungeon/floors/Floor00.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=61 format=4 uid="uid://dl6h1djc27ddl"]
+[gd_scene load_steps=63 format=4 uid="uid://dl6h1djc27ddl"]
 
 [ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Floor0.cs" id="1_db2o3"]
 [ext_resource type="Texture2D" uid="uid://b27ksiyfefb33" path="res://src/map/dungeon/models/Set A/02. Altar/02_ALTAR_FLOOR_ZER0_VER_outside_desert.png" id="2_xh2ej"]
@@ -15,6 +15,8 @@
 [ext_resource type="Texture2D" uid="uid://dyufabjcwlago" path="res://src/map/dungeon/models/Set A/02. Altar/02_ALTAR_FLOOR_ZER0_VER_HAND_CYCLE_MOTIF.png" id="13_1i307"]
 [ext_resource type="Texture2D" uid="uid://4k6vtn4oip5f" path="res://src/map/dungeon/models/Set A/02. Altar/02_ALTAR_FLOOR_ZER0_VER_TILE4.png" id="14_qqc7i"]
 [ext_resource type="Texture2D" uid="uid://cururtxtgylxf" path="res://src/map/dungeon/models/Set A/02. Altar/02_ALTAR_FLOOR_ZER0_VER_COLUMN.jpg" id="15_ojbcg"]
+[ext_resource type="PackedScene" uid="uid://1fl6s352e2ej" path="res://src/items/throwable/ThrowableItem.tscn" id="16_db2o3"]
+[ext_resource type="Resource" uid="uid://qqg0gdcb8fwg" path="res://src/items/throwable/resources/SpellSignKnowledge.tres" id="17_ntxe5"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3ubi4"]
 shading_mode = 0
@@ -896,3 +898,7 @@ shape = SubResource("BoxShape3D_db2o3")
 
 [node name="Camera3D" type="Camera3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.00384, 1.80761, 11.3571)
+
+[node name="ThrowableItem" parent="." instance=ExtResource("16_db2o3")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.78811, -3.32789, 0)
+_throwableItemStats = ExtResource("17_ntxe5")