To net8.0

This commit is contained in:
h z
2024-07-13 09:29:45 +01:00
parent 1df3c08a9e
commit f6a8f3e899
31 changed files with 53 additions and 72 deletions

View File

@@ -3,7 +3,6 @@ using Enigmos.Cables;
using Enigmos.Modules;
using Enigmos.Modules.ProgrammableModules;
using Godot;
using Nocturnis.DataStructures;
using Nocturnis.Enigmos.Boards;
using Nocturnis.Enigmos.Cables;
using Nocturnis.Enigmos.Modules;
@@ -93,12 +92,6 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
CircuitBoardControlLayer.Board = this;
}
public override void _Ready()
{
base._Ready();
}
protected virtual void AddModule(IBaseModule module, Vector2 pos)
{
module.Board = this;

View File

@@ -1,17 +1,18 @@
using Enigmos.Modules.ControllingModules;
using Enigmos.Modules.TerminalModules;
using Nocturnis.Creatures;
using Nocturnis.Enigmos.Boards;
using Nocturnis.Enigmos.Modules;
using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Controls;
namespace Enigmos.Boards;
public partial class PrimaryModuleBoard : BaseBoard
public partial class PrimaryModuleBoard : BaseBoard, IPrimaryBoard
{
private IBaseCreature? ManagedBy { get; set; }
public IRootModule? Root { get; set; }
public EngineModule? Engine { get; set; }
private IBaseCreature ManagedBy { get; set; }
public IRootModule Root { get; set; }
public IEngineModule Engine { get; set; }
public void Init(IBaseCreature manager)
@@ -29,7 +30,7 @@ public partial class PrimaryModuleBoard : BaseBoard
if (!Root!.ActionFinished)
return;
//Root.Timer = Stopwatch.StartNew();
Engine!.Drain();
Engine!.Consume();
if (EnigmosControl.Instance.Energy < EnigmosConstant.IdlePower)
{
Root!.ActionFinished = true;
@@ -38,15 +39,8 @@ public partial class PrimaryModuleBoard : BaseBoard
}
Root.Start();
foreach (ITerminalModule tm in TerminalModules)
{
tm.Consume();
}
//Root.RouteWithTimeoutHandle(Root);
//Root.Timer.Reset();
//foreach (TerminalModule module in TerminalModules())
// module.ConsumeWithTimeoutHandle(Root);
}
}