12 Commits
167 changed files with 2272 additions and 221 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
<Project Sdk="Godot.NET.Sdk/4.7.1">
<Project Sdk="Godot.NET.Sdk/4.7.2">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
<RootNamespace>Game</RootNamespace>
</PropertyGroup>
+25
View File
@@ -61,6 +61,31 @@ toggle_console={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194332,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}
move_down={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}
interact={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
]
}
use_left_hand={
"deadzone": 0.2,
"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null)
]
}
use_right_hand={
"deadzone": 0.2,
"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null)
]
}
drop_modifier={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":103,"location":0,"echo":false,"script":null)
]
}
[physics]
@@ -7,7 +7,7 @@ public sealed class ClearCommand : ICommand
{
public string Name => "clear";
public string Description => "Clears the console output.";
public IReadOnlyList<CommandArgSpec> Args { get; } = new CommandArgsBuilder().Build();
public IReadOnlyList<CommandArgSpec> Args { get; } = [];
public CommandResult Execute(CommandArgValues args) => CommandResult.Ok(clearOutput: true);
}
@@ -9,7 +9,7 @@ public sealed class HelpCommand(ICommandRegistry registry) : ICommand
{
public string Name => "help";
public string Description => "Lists all available commands.";
public IReadOnlyList<CommandArgSpec> Args { get; } = new CommandArgsBuilder().Build();
public IReadOnlyList<CommandArgSpec> Args { get; } = [];
private static string FormatUsage(ICommand command)
{
@@ -0,0 +1,29 @@
using System.Collections.Generic;
using Game.Features.Console.Contracts;
using Game.Features.Multiplayer.Contracts;
using Game.Features.Multiplayer.Contracts.Exceptions;
namespace Game.Features.Console.Application.Commands;
public sealed class HostCommand(IMultiplayerPeer multiplayer) : ICommand
{
public string Name => "host";
public string Description => "Starts hosting a multiplayer session on the given port.";
public IReadOnlyList<CommandArgSpec> Args { get; } = new CommandArgsBuilder().AddIntArg("port").Build();
public CommandResult Execute(CommandArgValues args)
{
int port = args.GetInt(0);
try
{
multiplayer.Host(port);
}
catch (MultiplayerException ex)
{
return CommandResult.Fail(ex.Message);
}
return CommandResult.Ok($"Hosting on port {port}.");
}
}
@@ -0,0 +1 @@
uid://crmnspnxcut3y
@@ -0,0 +1,35 @@
using System.Collections.Generic;
using Game.Features.Console.Contracts;
using Game.Features.Multiplayer.Contracts;
using Game.Features.Multiplayer.Contracts.Exceptions;
namespace Game.Features.Console.Application.Commands;
public sealed class JoinCommand(IMultiplayerPeer multiplayer) : ICommand
{
private const string AddressPattern =
@"^(localhost|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$";
public string Name => "join";
public string Description => "Joins a multiplayer session at the given address and port.";
public IReadOnlyList<CommandArgSpec> Args { get; } =
new CommandArgsBuilder().AddRegexArg("address", AddressPattern).AddIntArg("port").Build();
public CommandResult Execute(CommandArgValues args)
{
string address = args.GetString(0);
int port = args.GetInt(1);
try
{
multiplayer.Join(address, port);
}
catch (MultiplayerException ex)
{
return CommandResult.Fail(ex.Message);
}
return CommandResult.Ok($"Connecting to {address}:{port}...");
}
}
@@ -0,0 +1 @@
uid://c80rskv3u7su7
@@ -0,0 +1,20 @@
using System.Collections.Generic;
using Game.Features.Console.Contracts;
using Game.Features.Players.Contracts;
namespace Game.Features.Console.Application.Commands;
public sealed class NoclipCommand(IMovementModeSwitcher movementModeSwitcher) : ICommand
{
public string Name => "noclip";
public string Description => "Toggles noclip movement mode.";
public IReadOnlyList<CommandArgSpec> Args { get; } = [];
public CommandResult Execute(CommandArgValues args)
{
MovementMode next = movementModeSwitcher.ActiveMovementMode == MovementMode.Noclip ? MovementMode.Ground : MovementMode.Noclip;
movementModeSwitcher.SetMovementMode(next);
return CommandResult.Ok(next == MovementMode.Noclip ? "Noclip enabled." : "Noclip disabled.");
}
}
@@ -0,0 +1 @@
uid://de2nlceiv1per
@@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Game.Features.Console.Contracts;
using Game.Features.Items.Contracts;
namespace Game.Features.Console.Application.Commands;
public sealed class SpawnItemCommand : ICommand
{
private readonly IItemSpawner _spawner;
private readonly IItemSpawnPoint _spawnPoint;
public string Name => "spawn_item";
public string Description => "Spawns an item in front of the player.";
public IReadOnlyList<CommandArgSpec> Args { get; }
public SpawnItemCommand(IItemSpawner spawner, IItemSpawnPoint spawnPoint)
{
_spawner = spawner;
_spawnPoint = spawnPoint;
string[] definitions = spawner.DefinitionIds
.Select(id => id.Value)
.OrderBy(id => id, StringComparer.Ordinal)
.ToArray();
Args = new CommandArgsBuilder().AddChoiceArg("item", definitions).Build();
}
public CommandResult Execute(CommandArgValues args)
{
ItemDefinitionId definitionId = new(args.GetString(0));
ItemActionResult result = _spawner.TrySpawn(
definitionId,
_spawnPoint.GetItemSpawnPosition(),
out ItemInstanceId itemId
);
return result.Success
? CommandResult.Ok($"Spawned {definitionId} ({itemId}).")
: CommandResult.Fail(result.Message);
}
}
@@ -0,0 +1 @@
uid://e8m3q6v1r9k4w
@@ -2,10 +2,26 @@ using System.Collections.Generic;
namespace Game.Features.Console.Contracts;
public sealed record CommandArgSpec(string Name, CommandArgType Type, IReadOnlyList<string> Choices = null)
public enum CommandArgType
{
public override string ToString() =>
Type == CommandArgType.Choice && Choices is not null
? string.Join("|", Choices)
: Type.ToString().ToLowerInvariant();
String,
Int,
Float,
Bool,
Choice,
Regex
}
public sealed record CommandArgSpec(
string Name,
CommandArgType Type,
IReadOnlyList<string> Choices = null,
string Pattern = null
) {
public override string ToString() => Type switch
{
CommandArgType.Choice when Choices is not null => string.Join("|", Choices),
CommandArgType.Regex when Pattern is not null => "regex",
_ => Type.ToString().ToLowerInvariant()
};
}
@@ -1,10 +0,0 @@
namespace Game.Features.Console.Contracts;
public enum CommandArgType
{
String,
Int,
Float,
Bool,
Choice
}
@@ -1 +0,0 @@
uid://dnt7hwlwqtdyq
@@ -36,5 +36,11 @@ public sealed class CommandArgsBuilder
return this;
}
public CommandArgsBuilder AddRegexArg(string name, string pattern)
{
_specs.Add(new CommandArgSpec(name, CommandArgType.Regex, Pattern: pattern));
return this;
}
public IReadOnlyList<CommandArgSpec> Build() => _specs.ToArray();
}
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text.RegularExpressions;
using Game.Features.Console.Contracts;
namespace Game.Features.Console.Domain;
@@ -18,6 +19,7 @@ public static class CommandArgValidator
CommandArgType.Float => float.TryParse(rawValue, NumberStyles.Float, CultureInfo.InvariantCulture, out _),
CommandArgType.Bool => bool.TryParse(rawValue, out _),
CommandArgType.Choice => spec.Choices is not null && ChoicesContain(spec.Choices, rawValue),
CommandArgType.Regex => spec.Pattern is not null && Regex.IsMatch(rawValue, spec.Pattern),
_ => throw new ArgumentOutOfRangeException(nameof(spec), spec.Type, null)
};
+17 -11
View File
@@ -1,6 +1,7 @@
using Game.Features.Console.Application;
using Game.Features.Console.Contracts;
using Game.Features.Console.Infrastructure;
using Game.Features.Logging.Contracts;
using Game.Godot;
using Game.Godot.Extensions;
using Game.Godot.Mappings;
@@ -8,7 +9,7 @@ using Godot;
namespace Game.Features.Console.Godot;
public partial class ConsoleController : CanvasLayer
public partial class ConsoleController : CanvasLayer, ILogTarget
{
[Export] public LineEdit CommandInput;
[Export] public RichTextLabel OutputLog;
@@ -32,16 +33,6 @@ public partial class ConsoleController : CanvasLayer
_mouseMemento.RestoreCaptureMode();
}
}
private void AppendLine(string line)
{
OutputLog.AppendText(line + "\n");
}
public void UseCommandRegistry(ICommandRegistry registry)
{
_commandExecute = new CommandExecute(registry);
}
private void OnInputSubmitted(string text)
{
@@ -64,6 +55,21 @@ public partial class ConsoleController : CanvasLayer
}
}
private void AppendLine(string line)
{
OutputLog.AppendText(line + "\n");
}
public void UseCommandRegistry(ICommandRegistry registry)
{
_commandExecute = new CommandExecute(registry);
}
public void WriteLogLine(string logLine)
{
AppendLine(logLine);
}
public override void _Ready()
{
this.AssertRequiredExports();
@@ -0,0 +1,8 @@
using Game.Features.Interactions.Contracts;
namespace Game.Features.Interactions.Application;
public sealed class InteractionService(IInteractionWorld world) : IInteractionService
{
public InteractionResult TryInteract(InteractionRequest request) => world.TryInteract(request);
}
@@ -0,0 +1 @@
uid://b1m7q4y9c5v2n
@@ -0,0 +1,6 @@
namespace Game.Features.Interactions.Contracts;
public interface IInteractionService
{
InteractionResult TryInteract(InteractionRequest request);
}
@@ -0,0 +1 @@
uid://a3n8v5r1q7m9c
@@ -0,0 +1,8 @@
namespace Game.Features.Interactions.Contracts;
public interface IInteractionTarget
{
InteractionTargetId Id { get; }
bool CanInteract { get; }
InteractionPrompt Prompt { get; }
}
@@ -0,0 +1 @@
uid://c7p2y5n8f1v6m
@@ -0,0 +1,6 @@
namespace Game.Features.Interactions.Contracts;
public interface IInteractionWorld
{
InteractionResult TryInteract(InteractionRequest request);
}
@@ -0,0 +1 @@
uid://d7k1x6m4v9q2b
@@ -0,0 +1,3 @@
namespace Game.Features.Interactions.Contracts;
public readonly record struct InteractionPrompt(string Text);
@@ -0,0 +1 @@
uid://b3m8r1x6d9w4k
@@ -0,0 +1,5 @@
using Game.Features.Players.Contracts;
namespace Game.Features.Interactions.Contracts;
public readonly record struct InteractionRequest(PlayerId PlayerId, InteractionTargetId TargetId);
@@ -0,0 +1 @@
uid://e2q7k5n1w8m4d
@@ -0,0 +1,10 @@
namespace Game.Features.Interactions.Contracts;
public readonly record struct InteractionResult(InteractionStatus Status, string Message = "")
{
public bool Success => Status == InteractionStatus.Success;
public static InteractionResult Ok() => new(InteractionStatus.Success);
public static InteractionResult Fail(InteractionStatus status, string message) => new(status, message);
}
@@ -0,0 +1 @@
uid://f9w2d7k4m6q1x
@@ -0,0 +1,9 @@
namespace Game.Features.Interactions.Contracts;
public enum InteractionStatus
{
Success,
TargetNotFound,
Unavailable,
Rejected
}
@@ -0,0 +1 @@
uid://b4y9m3r6v1c8p
@@ -0,0 +1,8 @@
using System;
namespace Game.Features.Interactions.Contracts;
public readonly record struct InteractionTargetId(Guid Value)
{
public override string ToString() => Value.ToString();
}
@@ -0,0 +1 @@
uid://c6m1v8q4r9x2k
@@ -0,0 +1,27 @@
using Game.Godot.Extensions;
using Godot;
namespace Game.Features.Interactions.Godot;
public partial class InteractionPromptController : CanvasLayer
{
[Export] public Label PromptLabel;
public override void _Ready()
{
this.AssertRequiredExports();
Clear();
}
public void ShowPrompt(string text)
{
PromptLabel.Text = text;
PromptLabel.Visible = text.Length > 0;
}
public void Clear()
{
PromptLabel.Text = string.Empty;
PromptLabel.Visible = false;
}
}
@@ -0,0 +1 @@
uid://b9r2w6n4f8k1v
@@ -0,0 +1,26 @@
using Godot;
namespace Game.Features.Interactions.Godot;
public partial class InteractionRaycaster : RayCast3D
{
public T GetTarget<T>() where T : class
{
if (!IsColliding() || GetCollider() is not Node node)
{
return null;
}
while (node is not null)
{
if (node is T target)
{
return target;
}
node = node.GetParent();
}
return null;
}
}
@@ -0,0 +1 @@
uid://e4m7k1x8c3q6h
@@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using Game.Features.Interactions.Contracts;
using Godot;
namespace Game.Features.Interactions.Godot;
public partial class InteractionWorldController : Node, IInteractionWorld
{
public const string RegistryGroup = "interaction_world_registry";
private readonly Dictionary<InteractionTargetId, WorldInteractionController> _targets = [];
public override void _EnterTree()
{
AddToGroup(RegistryGroup);
}
public void RegisterSceneTargets()
{
foreach (Node node in GetTree().GetNodesInGroup(WorldInteractionController.InteractionGroup))
{
if (node is WorldInteractionController target)
{
Register(target);
}
}
}
public void Register(WorldInteractionController target)
{
if (_targets.TryGetValue(target.Id, out WorldInteractionController existing))
{
if (ReferenceEquals(existing, target))
{
return;
}
throw new InvalidOperationException($"Duplicate interaction target id: {target.Id}.");
}
_targets.Add(target.Id, target);
target.RegisterWith(this);
}
public void Unregister(InteractionTargetId targetId)
{
_targets.Remove(targetId);
}
public InteractionResult TryInteract(InteractionRequest request)
{
if (!_targets.TryGetValue(request.TargetId, out WorldInteractionController target))
{
return InteractionResult.Fail(InteractionStatus.TargetNotFound, $"Target {request.TargetId} was not found.");
}
if (!target.CanInteract)
{
return InteractionResult.Fail(InteractionStatus.Unavailable, "The target is not currently available.");
}
return target.Execute(request.PlayerId);
}
}
@@ -0,0 +1 @@
uid://f6q1c9m4w7v2n
@@ -0,0 +1,223 @@
using System.Collections.Generic;
using Game.Features.Interactions.Contracts;
using Game.Features.Items.Contracts;
using Game.Features.Players.Contracts;
using Game.Godot;
using Game.Godot.Extensions;
using Game.Godot.Mappings;
using Godot;
namespace Game.Features.Interactions.Godot;
public partial class PlayerInteractionController : Node, IItemSpawnPoint
{
[Export] public Camera3D Camera;
[Export] public CharacterBody3D Body;
[Export] public InteractionRaycaster InteractionRaycaster;
[Export] public RayCast3D DropRaycaster;
[Export] public InteractionPromptController PromptController;
[Export] public Node3D LeftHandAnchor;
[Export] public Node3D RightHandAnchor;
private IItemInteractionService _items;
private IInteractionService _interactions;
private PlayerId _playerId;
private readonly HashSet<Hand> _dropActions = [];
private readonly Dictionary<Hand, InteractionTargetId?> _activeUseTargets = [];
public override void _Ready()
{
this.AssertRequiredExports();
}
public void Initialize(
PlayerId playerId,
IItemInteractionService items,
IInteractionService interactions
)
{
_playerId = playerId;
_items = items;
_interactions = interactions;
}
public override void _Process(double delta)
{
if (_items is null || _interactions is null || GamePause.IsPaused || !MouseCapture.IsCaptured)
{
PromptController.Clear();
return;
}
UpdatePrompt();
}
public override void _UnhandledInput(InputEvent @event)
{
if (_items is null || _interactions is null || GamePause.IsPaused || !MouseCapture.IsCaptured)
{
return;
}
if (@event.IsActionPressed(InputAction.UseLeftHand.ActionName()))
{
ProcessHandActionStarted(Hand.Left);
GetViewport().SetInputAsHandled();
return;
}
if (@event.IsActionReleased(InputAction.UseLeftHand.ActionName()))
{
ProcessHandActionCompleted(Hand.Left);
GetViewport().SetInputAsHandled();
return;
}
if (@event.IsActionPressed(InputAction.UseRightHand.ActionName()))
{
ProcessHandActionStarted(Hand.Right);
GetViewport().SetInputAsHandled();
return;
}
if (@event.IsActionReleased(InputAction.UseRightHand.ActionName()))
{
ProcessHandActionCompleted(Hand.Right);
GetViewport().SetInputAsHandled();
return;
}
if (@event.IsActionPressed(InputAction.Interact.ActionName()))
{
IInteractionTarget target = InteractionRaycaster.GetTarget<IInteractionTarget>();
if (target?.CanInteract == true)
{
_interactions.TryInteract(new InteractionRequest(_playerId, target.Id));
}
GetViewport().SetInputAsHandled();
}
}
public Vector3 GetItemSpawnPosition() => CalculateDropPosition();
private void ProcessHandActionStarted(Hand hand)
{
if (Input.IsActionPressed(InputAction.DropModifier.ActionName()))
{
if (_activeUseTargets.Remove(hand, out InteractionTargetId? activeTargetId))
{
_items.TryUse(new ItemUseRequest(
_playerId,
hand,
ItemActionPhase.Cancelled,
activeTargetId
));
}
_items.TryDrop(hand, CalculateDropPosition());
_dropActions.Add(hand);
return;
}
if (!_items.IsHandFree(hand))
{
ItemUseRequest request = CreateUseRequest(hand, ItemActionPhase.Started);
ItemActionResult result = _items.TryUse(request);
if (result.Success)
{
_activeUseTargets[hand] = request.TargetId;
}
return;
}
IPickupTarget target = InteractionRaycaster.GetTarget<IPickupTarget>();
if (target is not null)
{
_items.TryPickup(target.ItemInfo.Id, hand);
}
}
private void ProcessHandActionCompleted(Hand hand)
{
if (_dropActions.Remove(hand))
{
return;
}
if (_activeUseTargets.Remove(hand, out InteractionTargetId? targetId))
{
_items.TryUse(new ItemUseRequest(_playerId, hand, ItemActionPhase.Completed, targetId));
}
}
private ItemUseRequest CreateUseRequest(Hand hand, ItemActionPhase phase)
{
InteractionTargetId? targetId = InteractionRaycaster.GetTarget<IInteractionTarget>()?.Id;
return new ItemUseRequest(_playerId, hand, phase, targetId);
}
private Vector3 CalculateDropPosition()
{
DropRaycaster.ForceRaycastUpdate();
Vector3 origin = Camera.GlobalPosition;
Vector3 direction = -Camera.GlobalBasis.Z.Normalized();
float distance = DropRaycaster.TargetPosition.Length();
if (DropRaycaster.IsColliding())
{
distance = Mathf.Max(0.25f, origin.DistanceTo(DropRaycaster.GetCollisionPoint()) - 0.2f);
}
return origin + direction * distance;
}
private void UpdatePrompt()
{
IPickupTarget pickupTarget = InteractionRaycaster.GetTarget<IPickupTarget>();
if (pickupTarget is not null)
{
ShowPickupPrompt(pickupTarget.ItemInfo);
return;
}
IInteractionTarget interactionTarget = InteractionRaycaster.GetTarget<IInteractionTarget>();
if (interactionTarget?.CanInteract == true)
{
PromptController.ShowPrompt($"[E] {interactionTarget.Prompt.Text}");
return;
}
PromptController.Clear();
}
private void ShowPickupPrompt(ItemInfo itemInfo)
{
if (itemInfo.HandRequirement == HandRequirement.Both)
{
bool bothHandsFree = _items.IsHandFree(Hand.Left) && _items.IsHandFree(Hand.Right);
PromptController.ShowPrompt(bothHandsFree
? $"[LPM lub PPM] Podnieś {itemInfo.DisplayName} — obie ręce"
: "Potrzebujesz obu wolnych rąk");
return;
}
List<string> actions = [];
if (_items.IsHandFree(Hand.Left))
{
actions.Add($"[LPM] Podnieś {itemInfo.DisplayName} — lewa ręka");
}
if (_items.IsHandFree(Hand.Right))
{
actions.Add($"[PPM] Podnieś {itemInfo.DisplayName} — prawa ręka");
}
PromptController.ShowPrompt(actions.Count > 0
? string.Join("\n", actions)
: "Brak wolnej ręki");
}
}
@@ -0,0 +1 @@
uid://c2v8m5r1y7q4d
@@ -0,0 +1,52 @@
using System;
using Game.Features.Interactions.Contracts;
using Game.Features.Players.Contracts;
using Godot;
namespace Game.Features.Interactions.Godot;
public abstract partial class WorldInteractionController : Node3D, IInteractionTarget
{
public const string InteractionGroup = "world_interactions";
[Export] public string InstanceId;
[Export] public string PromptText = "Wejdź w interakcję";
public InteractionTargetId Id { get; private set; }
public virtual bool CanInteract => true;
public InteractionPrompt Prompt => new(PromptText);
private InteractionWorldController _registry;
public override void _Ready()
{
Guid id = string.IsNullOrWhiteSpace(InstanceId) ? Guid.NewGuid() : Guid.Parse(InstanceId);
Id = new InteractionTargetId(id);
AddToGroup(InteractionGroup);
RegisterWithAvailableWorld();
}
public override void _ExitTree()
{
_registry?.Unregister(Id);
}
public void RegisterWith(InteractionWorldController registry)
{
_registry = registry;
}
public abstract InteractionResult Execute(PlayerId playerId);
private void RegisterWithAvailableWorld()
{
foreach (Node node in GetTree().GetNodesInGroup(InteractionWorldController.RegistryGroup))
{
if (node is InteractionWorldController registry)
{
registry.Register(this);
return;
}
}
}
}
@@ -0,0 +1 @@
uid://d2r8m5v1q9k4x
@@ -0,0 +1,83 @@
using Game.Features.Items.Contracts;
using Game.Features.Items.Domain;
using Godot;
namespace Game.Features.Items.Application;
public sealed class ItemInteractionService(
HandsInventory hands,
IItemRepository itemRepository,
IHeldItemPresenter presenter
) : IItemInteractionService
{
public bool IsHandFree(Hand hand) => hands.IsFree(hand);
public ItemInstanceId? GetHeldItem(Hand hand) => hands.Get(hand);
public ItemActionResult TryPickup(ItemInstanceId itemId, Hand hand)
{
if (!itemRepository.TryGet(itemId, out IItemInstance item))
{
return ItemActionResult.Fail(ItemActionStatus.ItemNotFound, $"Item {itemId} was not found.");
}
if (!hands.TryHold(itemId, item.Info.HandRequirement, hand))
{
return ItemActionResult.Fail(ItemActionStatus.HandOccupied, "The requested hand is not available.");
}
if (presenter.TryShowHeld(item, hand))
{
return ItemActionResult.Ok();
}
hands.Release(hand);
return ItemActionResult.Fail(ItemActionStatus.PresentationFailed, "Could not present the held item.");
}
public ItemActionResult TryUse(ItemUseRequest request)
{
ItemInstanceId? itemId = hands.Get(request.Hand);
if (itemId is null)
{
return ItemActionResult.Fail(ItemActionStatus.HandEmpty, "The requested hand is empty.");
}
if (!itemRepository.TryGet(itemId.Value, out IItemInstance item))
{
return ItemActionResult.Fail(ItemActionStatus.ItemNotFound, $"Item {itemId} was not found.");
}
ItemActionResult result = item.Use(request);
if (result.Success)
{
presenter.Refresh(item);
}
return result;
}
public ItemActionResult TryDrop(Hand hand, Vector3 worldPosition)
{
ItemInstanceId? itemId = hands.Get(hand);
if (itemId is null)
{
return ItemActionResult.Fail(ItemActionStatus.HandEmpty, "The requested hand is empty.");
}
if (!itemRepository.TryGet(itemId.Value, out IItemInstance item))
{
return ItemActionResult.Fail(ItemActionStatus.ItemNotFound, $"Item {itemId} was not found.");
}
hands.Release(hand);
if (presenter.TryShowDropped(item, worldPosition))
{
return ItemActionResult.Ok();
}
hands.TryHold(itemId.Value, item.Info.HandRequirement, hand);
return ItemActionResult.Fail(ItemActionStatus.PresentationFailed, "Could not present the dropped item.");
}
}
@@ -0,0 +1 @@
uid://e6q2h9v5b8k3p
+7
View File
@@ -0,0 +1,7 @@
namespace Game.Features.Items.Contracts;
public enum Hand
{
Left,
Right
}
+1
View File
@@ -0,0 +1 @@
uid://c4n7h2w8m5q1p
@@ -0,0 +1,7 @@
namespace Game.Features.Items.Contracts;
public enum HandRequirement
{
One,
Both
}
@@ -0,0 +1 @@
uid://d8p3k6v1r9y4b
@@ -0,0 +1,10 @@
using Godot;
namespace Game.Features.Items.Contracts;
public interface IHeldItemPresenter
{
bool TryShowHeld(IItemInstance item, Hand hand);
bool TryShowDropped(IItemInstance item, Vector3 worldPosition);
void Refresh(IItemInstance item);
}
@@ -0,0 +1 @@
uid://c1q7y4d9m5x2v
@@ -0,0 +1,7 @@
namespace Game.Features.Items.Contracts;
public interface IItemInstance
{
ItemInfo Info { get; }
ItemActionResult Use(ItemUseRequest request);
}
@@ -0,0 +1 @@
uid://b5x9q3h7m2w8f
@@ -0,0 +1,12 @@
using Godot;
namespace Game.Features.Items.Contracts;
public interface IItemInteractionService
{
bool IsHandFree(Hand hand);
ItemInstanceId? GetHeldItem(Hand hand);
ItemActionResult TryPickup(ItemInstanceId itemId, Hand hand);
ItemActionResult TryUse(ItemUseRequest request);
ItemActionResult TryDrop(Hand hand, Vector3 worldPosition);
}
@@ -0,0 +1 @@
uid://f2k8q5b1w7m4n
@@ -0,0 +1,6 @@
namespace Game.Features.Items.Contracts;
public interface IItemRepository
{
bool TryGet(ItemInstanceId itemId, out IItemInstance item);
}
@@ -0,0 +1 @@
uid://e7n1m6v4k9r3q
@@ -0,0 +1,8 @@
using Godot;
namespace Game.Features.Items.Contracts;
public interface IItemSpawnPoint
{
Vector3 GetItemSpawnPosition();
}
@@ -0,0 +1 @@
uid://a2v6r8m3q7k5d
@@ -0,0 +1,10 @@
using System.Collections.Generic;
using Godot;
namespace Game.Features.Items.Contracts;
public interface IItemSpawner
{
IReadOnlyCollection<ItemDefinitionId> DefinitionIds { get; }
ItemActionResult TrySpawn(ItemDefinitionId definitionId, Vector3 worldPosition, out ItemInstanceId itemId);
}
@@ -0,0 +1 @@
uid://f4m9k2w6b8n1r
@@ -0,0 +1,6 @@
namespace Game.Features.Items.Contracts;
public interface IPickupTarget
{
ItemInfo ItemInfo { get; }
}
@@ -0,0 +1 @@
uid://c9v4g7p2m5x8d
@@ -0,0 +1,8 @@
namespace Game.Features.Items.Contracts;
public enum ItemActionPhase
{
Started,
Completed,
Cancelled
}
@@ -0,0 +1 @@
uid://c9w5d2n8q4m1h
@@ -0,0 +1,10 @@
namespace Game.Features.Items.Contracts;
public readonly record struct ItemActionResult(ItemActionStatus Status, string Message = "")
{
public bool Success => Status == ItemActionStatus.Success;
public static ItemActionResult Ok() => new(ItemActionStatus.Success);
public static ItemActionResult Fail(ItemActionStatus status, string message) => new(status, message);
}
@@ -0,0 +1 @@
uid://a8m4p1x7d3q6k
@@ -0,0 +1,12 @@
namespace Game.Features.Items.Contracts;
public enum ItemActionStatus
{
Success,
ItemNotFound,
HandOccupied,
HandEmpty,
UnsupportedAction,
PresentationFailed,
UnknownDefinition
}
@@ -0,0 +1 @@
uid://f1r6y3b9k5v2m
@@ -0,0 +1,7 @@
namespace Game.Features.Items.Contracts;
public readonly record struct ItemDefinition(
ItemDefinitionId Id,
string DisplayName,
HandRequirement HandRequirement
);
@@ -0,0 +1 @@
uid://e3v8k4r1m7x2p
@@ -0,0 +1,6 @@
namespace Game.Features.Items.Contracts;
public readonly record struct ItemDefinitionId(string Value)
{
public override string ToString() => Value;
}
@@ -0,0 +1 @@
uid://b7q2n9c5w1m6y
+8
View File
@@ -0,0 +1,8 @@
namespace Game.Features.Items.Contracts;
public readonly record struct ItemInfo(
ItemInstanceId Id,
ItemDefinitionId DefinitionId,
string DisplayName,
HandRequirement HandRequirement
);
@@ -0,0 +1 @@
uid://e1r5j8w3n6c9h
@@ -0,0 +1,8 @@
using System;
namespace Game.Features.Items.Contracts;
public readonly record struct ItemInstanceId(Guid Value)
{
public override string ToString() => Value.ToString();
}
@@ -0,0 +1 @@
uid://b6x2f9m4t7k3q
@@ -0,0 +1,11 @@
using Game.Features.Interactions.Contracts;
using Game.Features.Players.Contracts;
namespace Game.Features.Items.Contracts;
public readonly record struct ItemUseRequest(
PlayerId PlayerId,
Hand Hand,
ItemActionPhase Phase,
InteractionTargetId? TargetId = null
);
@@ -0,0 +1 @@
uid://d6k2v8m5r1c9n
@@ -0,0 +1,19 @@
using Game.Features.Items.Contracts;
namespace Game.Features.Items.Domain.Flashlight;
public sealed class FlashlightItemInstance(ItemInfo info) : IItemInstance
{
public ItemInfo Info { get; } = info;
public bool IsOn { get; private set; }
public ItemActionResult Use(ItemUseRequest request)
{
if (request.Phase == ItemActionPhase.Started)
{
IsOn = !IsOn;
}
return ItemActionResult.Ok();
}
}
@@ -0,0 +1 @@
uid://b8r2n5q9w4m1y
@@ -0,0 +1,83 @@
using System;
using Game.Features.Items.Contracts;
namespace Game.Features.Items.Domain;
public sealed class HandsInventory
{
private ItemInstanceId? _leftHand;
private ItemInstanceId? _rightHand;
public bool IsFree(Hand hand) => Get(hand) is null;
public ItemInstanceId? Get(Hand hand) => hand switch
{
Hand.Left => _leftHand,
Hand.Right => _rightHand,
_ => throw new ArgumentOutOfRangeException(nameof(hand), hand, null)
};
public bool TryHold(ItemInstanceId itemId, HandRequirement requirement, Hand hand)
{
if (_leftHand == itemId || _rightHand == itemId)
{
return false;
}
if (requirement == HandRequirement.Both)
{
if (_leftHand is not null || _rightHand is not null)
{
return false;
}
_leftHand = itemId;
_rightHand = itemId;
return true;
}
if (!IsFree(hand))
{
return false;
}
Set(hand, itemId);
return true;
}
public ItemInstanceId? Release(Hand hand)
{
ItemInstanceId? itemId = Get(hand);
if (itemId is null)
{
return null;
}
if (_leftHand == itemId)
{
_leftHand = null;
}
if (_rightHand == itemId)
{
_rightHand = null;
}
return itemId;
}
private void Set(Hand hand, ItemInstanceId itemId)
{
switch (hand)
{
case Hand.Left:
_leftHand = itemId;
break;
case Hand.Right:
_rightHand = itemId;
break;
default:
throw new ArgumentOutOfRangeException(nameof(hand), hand, null);
}
}
}
@@ -0,0 +1 @@
uid://d5w1n8c4q7m2y
@@ -0,0 +1,13 @@
using Game.Features.Items.Contracts;
namespace Game.Features.Items.Domain;
public sealed class PassiveItemInstance(ItemInfo info) : IItemInstance
{
public ItemInfo Info { get; } = info;
public ItemActionResult Use(ItemUseRequest request) => ItemActionResult.Fail(
ItemActionStatus.UnsupportedAction,
$"Item {Info.DefinitionId} cannot be used directly."
);
}
@@ -0,0 +1 @@
uid://d9p4x1m7v3k6c
@@ -0,0 +1,26 @@
[gd_scene load_steps=3 format=3 uid="uid://dy6p2w9m4c8kr"]
[sub_resource type="StandardMaterial3D" id="Material_flashlight"]
albedo_color = Color(0.08, 0.09, 0.1, 1)
metallic = 0.65
roughness = 0.3
[sub_resource type="CylinderMesh" id="Mesh_flashlight"]
material = SubResource("Material_flashlight")
top_radius = 0.055
bottom_radius = 0.07
height = 0.32
radial_segments = 12
[node name="FlashlightHeldView" type="Node3D"]
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, -0.08)
mesh = SubResource("Mesh_flashlight")
[node name="SpotLight3D" type="SpotLight3D" parent="."]
visible = false
light_energy = 3.0
shadow_enabled = true
spot_range = 14.0
spot_angle = 24.0
@@ -0,0 +1,47 @@
[gd_scene load_steps=6 format=3 uid="uid://cv8m3q1y6r4nf"]
[ext_resource type="Script" uid="uid://a5q9y2d7m4v8p" path="res://src/Features/Items/Godot/Flashlight/FlashlightItemController.cs" id="1_script"]
[ext_resource type="PackedScene" uid="uid://dy6p2w9m4c8kr" path="res://src/Features/Items/Godot/Flashlight/FlashlightHeldView.tscn" id="2_held"]
[sub_resource type="StandardMaterial3D" id="Material_flashlight"]
albedo_color = Color(0.08, 0.09, 0.1, 1)
metallic = 0.65
roughness = 0.3
[sub_resource type="CylinderMesh" id="Mesh_flashlight"]
material = SubResource("Material_flashlight")
top_radius = 0.055
bottom_radius = 0.07
height = 0.32
radial_segments = 12
[sub_resource type="CapsuleShape3D" id="Shape_flashlight"]
radius = 0.07
height = 0.32
[node name="FlashlightItem" type="RigidBody3D" node_paths=PackedStringArray("Collision", "WorldVisual", "WorldLight")]
mass = 0.4
script = ExtResource("1_script")
DefinitionId = "flashlight"
DisplayName = "latarkę"
Collision = NodePath("CollisionShape3D")
WorldVisual = NodePath("WorldVisual")
HeldViewScene = ExtResource("2_held")
WorldLight = NodePath("WorldVisual/SpotLight3D")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0)
shape = SubResource("Shape_flashlight")
[node name="WorldVisual" type="Node3D" parent="."]
[node name="MeshInstance3D" type="MeshInstance3D" parent="WorldVisual"]
transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0)
mesh = SubResource("Mesh_flashlight")
[node name="SpotLight3D" type="SpotLight3D" parent="WorldVisual"]
visible = false
light_energy = 3.0
shadow_enabled = true
spot_range = 14.0
spot_angle = 24.0
@@ -0,0 +1,39 @@
using Game.Features.Items.Contracts;
using Game.Features.Items.Domain.Flashlight;
using Game.Features.Items.Godot;
using Godot;
namespace Game.Features.Items.Godot.Flashlight;
public partial class FlashlightItemController : WorldItemController
{
[Export] public SpotLight3D WorldLight;
private SpotLight3D _heldLight;
protected override IItemInstance CreateItemInstance(ItemInfo itemInfo) => new FlashlightItemInstance(itemInfo);
protected override void OnHeldViewCreated(Node3D heldView)
{
_heldLight = heldView.GetNodeOrNull<SpotLight3D>("SpotLight3D");
}
protected override void OnHeldViewRemoving(Node3D heldView)
{
_heldLight = null;
}
protected override void OnPresentationChanged(IItemInstance item)
{
bool isOn = item is FlashlightItemInstance flashlight && flashlight.IsOn;
if (WorldLight is not null)
{
WorldLight.Visible = isOn && !IsHeld;
}
if (_heldLight is not null)
{
_heldLight.Visible = isOn;
}
}
}
@@ -0,0 +1 @@
uid://a5q9y2d7m4v8p
@@ -0,0 +1,95 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Game.Features.Items.Contracts;
using Game.Godot.Extensions;
using Godot;
namespace Game.Features.Items.Godot;
public partial class ItemSpawnerController : Node, IItemSpawner
{
[Export] public Node3D ItemsRoot;
[Export] public ItemWorldController ItemWorld;
[Export] public global::Godot.Collections.Array<PackedScene> ItemScenes = [];
private readonly Dictionary<ItemDefinitionId, PackedScene> _scenes = [];
public IReadOnlyCollection<ItemDefinitionId> DefinitionIds => _scenes.Keys.ToArray();
public override void _Ready()
{
this.AssertRequiredExports();
}
public void Initialize()
{
_scenes.Clear();
foreach (PackedScene scene in ItemScenes)
{
RegisterScene(scene);
}
foreach (WorldItemController item in ItemWorld.Items)
{
string scenePath = item.SceneFilePath;
if (string.IsNullOrWhiteSpace(scenePath))
{
continue;
}
PackedScene scene = ResourceLoader.Load<PackedScene>(scenePath);
if (scene is not null)
{
_scenes.TryAdd(item.ItemInfo.DefinitionId, scene);
}
}
if (_scenes.Count == 0)
{
throw new InvalidOperationException("The item spawn catalog is empty.");
}
}
public ItemActionResult TrySpawn(
ItemDefinitionId definitionId,
Vector3 worldPosition,
out ItemInstanceId itemId
) {
itemId = default;
if (!_scenes.TryGetValue(definitionId, out PackedScene scene))
{
return ItemActionResult.Fail(
ItemActionStatus.UnknownDefinition,
$"Unknown item definition: {definitionId}."
);
}
WorldItemController item = scene.Instantiate<WorldItemController>();
item.InstanceId = Guid.NewGuid().ToString();
ItemsRoot.AddChild(item);
item.GlobalPosition = worldPosition;
ItemWorld.Register(item);
itemId = item.ItemInfo.Id;
return ItemActionResult.Ok();
}
private void RegisterScene(PackedScene scene)
{
if (scene is null)
{
return;
}
WorldItemController prototype = scene.Instantiate<WorldItemController>();
ItemDefinitionId definitionId = new(prototype.DefinitionId);
prototype.Free();
if (!_scenes.TryAdd(definitionId, scene))
{
throw new InvalidOperationException($"Duplicate item spawn definition: {definitionId}.");
}
}
}
@@ -0,0 +1 @@
uid://c3x9m6w2q8r1b
@@ -0,0 +1,69 @@
using System;
using System.Collections.Generic;
using Game.Features.Items.Contracts;
using Godot;
namespace Game.Features.Items.Godot;
public partial class ItemWorldController : Node, IItemRepository
{
public const string RegistryGroup = "item_world_registry";
private readonly Dictionary<ItemInstanceId, WorldItemController> _items = [];
public IReadOnlyCollection<WorldItemController> Items => _items.Values;
public override void _EnterTree()
{
AddToGroup(RegistryGroup);
}
public void RegisterSceneItems()
{
foreach (Node node in GetTree().GetNodesInGroup(WorldItemController.ItemGroup))
{
if (node is WorldItemController item)
{
Register(item);
}
}
}
public void Register(WorldItemController item)
{
if (_items.TryGetValue(item.ItemInfo.Id, out WorldItemController existing))
{
if (ReferenceEquals(existing, item))
{
return;
}
throw new InvalidOperationException($"Duplicate item instance id: {item.ItemInfo.Id}.");
}
_items.Add(item.ItemInfo.Id, item);
item.RegisterWith(this);
}
public void Unregister(ItemInstanceId itemId)
{
_items.Remove(itemId);
}
public bool TryGet(ItemInstanceId itemId, out IItemInstance item)
{
if (_items.TryGetValue(itemId, out WorldItemController controller))
{
item = controller.Item;
return true;
}
item = null;
return false;
}
public bool TryGetController(ItemInstanceId itemId, out WorldItemController controller)
{
return _items.TryGetValue(itemId, out controller);
}
}
@@ -0,0 +1 @@
uid://f8n3b6w1k5r9m
@@ -0,0 +1,42 @@
using Game.Features.Items.Contracts;
using Godot;
namespace Game.Features.Items.Godot;
public sealed class PlayerHeldItemPresenter(
ItemWorldController itemWorld,
Node3D leftHandAnchor,
Node3D rightHandAnchor
) : IHeldItemPresenter
{
public bool TryShowHeld(IItemInstance item, Hand hand)
{
if (!itemWorld.TryGetController(item.Info.Id, out WorldItemController controller))
{
return false;
}
Node3D anchor = hand == Hand.Left ? leftHandAnchor : rightHandAnchor;
controller.SetHeld(anchor, item);
return true;
}
public bool TryShowDropped(IItemInstance item, Vector3 worldPosition)
{
if (!itemWorld.TryGetController(item.Info.Id, out WorldItemController controller))
{
return false;
}
controller.SetDropped(worldPosition, item);
return true;
}
public void Refresh(IItemInstance item)
{
if (itemWorld.TryGetController(item.Info.Id, out WorldItemController controller))
{
controller.ApplyState(item);
}
}
}
@@ -0,0 +1 @@
uid://e5m2r8q1v7k4n
@@ -0,0 +1,141 @@
using System;
using Game.Features.Items.Contracts;
using Game.Features.Items.Domain;
using Game.Godot.Extensions;
using Godot;
namespace Game.Features.Items.Godot;
public partial class WorldItemController : RigidBody3D, IPickupTarget
{
public const string ItemGroup = "world_items";
[Export] public string InstanceId;
[Export] public string DefinitionId = "item";
[Export] public string DisplayName = "Item";
[Export] public HandRequirement HandRequirement = HandRequirement.One;
[Export] public CollisionShape3D Collision;
[Export] public Node3D WorldVisual;
[Export] public PackedScene HeldViewScene;
protected Node3D HeldView { get; private set; }
protected bool IsHeld => HeldView is not null;
public ItemInfo ItemInfo { get; private set; }
public ItemDefinition Definition { get; private set; }
public IItemInstance Item { get; private set; }
private ItemWorldController _registry;
public override void _Ready()
{
this.AssertRequiredExports();
if (string.IsNullOrWhiteSpace(DefinitionId))
{
throw new InvalidOperationException($"{Name}: item definition id cannot be empty.");
}
if (HeldViewScene is null)
{
throw new InvalidOperationException($"{Name}: held view scene is not assigned.");
}
Guid id = string.IsNullOrWhiteSpace(InstanceId)
? Guid.NewGuid()
: Guid.Parse(InstanceId);
Definition = new ItemDefinition(new ItemDefinitionId(DefinitionId), DisplayName, HandRequirement);
ItemInfo = new ItemInfo(
new ItemInstanceId(id),
Definition.Id,
Definition.DisplayName,
Definition.HandRequirement
);
Item = CreateItemInstance(ItemInfo);
AddToGroup(ItemGroup);
RegisterWithAvailableWorld();
ApplyState(Item);
}
public override void _ExitTree()
{
_registry?.Unregister(ItemInfo.Id);
}
public void RegisterWith(ItemWorldController registry)
{
_registry = registry;
}
public void SetHeld(Node3D anchor, IItemInstance item)
{
if (IsHeld)
{
return;
}
Freeze = true;
Sleeping = true;
LinearVelocity = Vector3.Zero;
AngularVelocity = Vector3.Zero;
Collision.SetDeferred(CollisionShape3D.PropertyName.Disabled, true);
WorldVisual.Visible = false;
HeldView = HeldViewScene.Instantiate<Node3D>();
anchor.AddChild(HeldView);
HeldView.Transform = Transform3D.Identity;
OnHeldViewCreated(HeldView);
ApplyState(item);
}
public void SetDropped(Vector3 worldPosition, IItemInstance item)
{
if (HeldView is not null)
{
OnHeldViewRemoving(HeldView);
HeldView.QueueFree();
HeldView = null;
}
GlobalPosition = worldPosition;
LinearVelocity = Vector3.Zero;
AngularVelocity = Vector3.Zero;
WorldVisual.Visible = true;
Collision.SetDeferred(CollisionShape3D.PropertyName.Disabled, false);
Freeze = false;
Sleeping = false;
ApplyState(item);
}
public void ApplyState(IItemInstance item)
{
OnPresentationChanged(item);
}
protected virtual IItemInstance CreateItemInstance(ItemInfo itemInfo) => new PassiveItemInstance(itemInfo);
protected virtual void OnHeldViewCreated(Node3D heldView)
{
}
protected virtual void OnHeldViewRemoving(Node3D heldView)
{
}
protected virtual void OnPresentationChanged(IItemInstance item)
{
}
private void RegisterWithAvailableWorld()
{
foreach (Node node in GetTree().GetNodesInGroup(ItemWorldController.RegistryGroup))
{
if (node is ItemWorldController registry)
{
registry.Register(this);
return;
}
}
}
}
@@ -0,0 +1 @@
uid://d1x7m4q9v2c6k

Some files were not shown because too many files have changed in this diff Show More