Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef5f7d127f | ||
|
|
db0356eb6f | ||
|
|
888e39e15d | ||
|
|
9fdd565637 | ||
|
|
3127c1b4af | ||
|
|
00627a7e91 | ||
|
|
bed12ad335 | ||
|
|
f4331f426c | ||
|
|
25e32f20d9 | ||
|
|
1445fc014f | ||
|
|
988f1102f8 | ||
|
|
5ee80df4c1 | ||
|
|
fc14cfe0c3 |
@@ -247,6 +247,27 @@ Loot -> Enemies.Application ŹLE
|
|||||||
Combat -> Enemies.Godot ŹLE
|
Combat -> Enemies.Godot ŹLE
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Wyjątek: `Godot` -> `Godot`
|
||||||
|
|
||||||
|
`Domain` i `Application` trzymają się reguły bez wyjątków - tam kontrakt broni czegoś realnego (można podmienić implementację, przetestować logikę bez silnika, nie ma przypadkowego sprzężenia).
|
||||||
|
|
||||||
|
`Godot` tego wsparcia nie potrzebuje - kontrolery są celowo "głupie" i nie są objęte testami automatycznymi, więc kontrakt istniałby tam wyłącznie po to, żeby ominąć ograniczenie edytora Godota (`[Export]` nie umie wskazywać na typ-interfejs). Dlatego `Godot` jednego feature'a może importować `Godot` innego feature'a bezpośrednio, najczęściej po to, żeby zawrzeć w scenie węzeł z innego feature'a (`[Export]` na konkretną klasę) i wywołać na nim kilka metod.
|
||||||
|
|
||||||
|
```text
|
||||||
|
Players.Godot -> Interactions.Godot DOBRZE (kontener sceny, wywołanie metod kontrolera)
|
||||||
|
Players.Application -> Interactions.Godot ŹLE (logika feature'a nadal tylko przez Contracts)
|
||||||
|
Players.Domain -> Interactions.Godot ŹLE
|
||||||
|
```
|
||||||
|
|
||||||
|
`GetNode`/`GetNodeOrNull` po ścieżce w scenie między feature'ami dalej jest niepożądane - zależność ma być jawna (typowane pole `[Export]` albo parametr metody `Initialize`/`Use...`), nie odnajdywana w drzewie sceny w runtime.
|
||||||
|
|
||||||
|
Ten wyjątek nie zwalnia z Prawa Demeter. Rozmawiamy tylko z bezpośrednim sąsiadem - jeśli feature trzyma w sobie kontroler innego feature'a, woła na nim metody sam, zamiast wystawiać go dalej do przechodzenia przez łańcuch (`node.Inner.Other.Method()`). Kod spoza feature'a nie powinien wiedzieć, że dany kontroler w ogóle zawiera w sobie coś z innego feature'a.
|
||||||
|
|
||||||
|
```text
|
||||||
|
player.SetMovementMode(mode) DOBRZE (PlayerController sam woła w środku Interaction/Body)
|
||||||
|
player.Interaction.SetActive(isActive) ŹLE (wywołujący łańcuje się przez Playera do Interaction)
|
||||||
|
```
|
||||||
|
|
||||||
### Eventy między feature'ami
|
### Eventy między feature'ami
|
||||||
|
|
||||||
Gdy jedno zdarzenie interesuje wiele feature'ów, feature źródłowy publikuje event i nie wie, kto go słucha:
|
Gdy jedno zdarzenie interesuje wiele feature'ów, feature źródłowy publikuje event i nie wie, kto go słucha:
|
||||||
|
|||||||
@@ -66,6 +66,26 @@ move_down={
|
|||||||
"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)
|
"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]
|
[physics]
|
||||||
|
|
||||||
|
|||||||
@@ -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,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, IItemDefinitionRegistry registry, IItemSpawnPoint spawnPoint)
|
||||||
|
{
|
||||||
|
_spawner = spawner;
|
||||||
|
_spawnPoint = spawnPoint;
|
||||||
|
|
||||||
|
string[] definitions = registry.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
|
||||||
@@ -8,13 +8,20 @@ public enum CommandArgType
|
|||||||
Int,
|
Int,
|
||||||
Float,
|
Float,
|
||||||
Bool,
|
Bool,
|
||||||
Choice
|
Choice,
|
||||||
|
Regex
|
||||||
}
|
}
|
||||||
|
|
||||||
public sealed record CommandArgSpec(string Name, CommandArgType Type, IReadOnlyList<string> Choices = null)
|
public sealed record CommandArgSpec(
|
||||||
|
string Name,
|
||||||
|
CommandArgType Type,
|
||||||
|
IReadOnlyList<string> Choices = null,
|
||||||
|
string Pattern = null
|
||||||
|
) {
|
||||||
|
public override string ToString() => Type switch
|
||||||
{
|
{
|
||||||
public override string ToString() =>
|
CommandArgType.Choice when Choices is not null => string.Join("|", Choices),
|
||||||
Type == CommandArgType.Choice && Choices is not null
|
CommandArgType.Regex when Pattern is not null => "regex",
|
||||||
? string.Join("|", Choices)
|
_ => Type.ToString().ToLowerInvariant()
|
||||||
: Type.ToString().ToLowerInvariant();
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,5 +36,11 @@ public sealed class CommandArgsBuilder
|
|||||||
return this;
|
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();
|
public IReadOnlyList<CommandArgSpec> Build() => _specs.ToArray();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
using Game.Features.Console.Contracts;
|
using Game.Features.Console.Contracts;
|
||||||
|
|
||||||
namespace Game.Features.Console.Domain;
|
namespace Game.Features.Console.Domain;
|
||||||
@@ -18,6 +19,7 @@ public static class CommandArgValidator
|
|||||||
CommandArgType.Float => float.TryParse(rawValue, NumberStyles.Float, CultureInfo.InvariantCulture, out _),
|
CommandArgType.Float => float.TryParse(rawValue, NumberStyles.Float, CultureInfo.InvariantCulture, out _),
|
||||||
CommandArgType.Bool => bool.TryParse(rawValue, out _),
|
CommandArgType.Bool => bool.TryParse(rawValue, out _),
|
||||||
CommandArgType.Choice => spec.Choices is not null && ChoicesContain(spec.Choices, rawValue),
|
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)
|
_ => throw new ArgumentOutOfRangeException(nameof(spec), spec.Type, null)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using Game.Features.Console.Application;
|
using Game.Features.Console.Application;
|
||||||
using Game.Features.Console.Contracts;
|
using Game.Features.Console.Contracts;
|
||||||
using Game.Features.Console.Infrastructure;
|
using Game.Features.Console.Infrastructure;
|
||||||
|
using Game.Features.Logging.Contracts;
|
||||||
using Game.Godot;
|
using Game.Godot;
|
||||||
using Game.Godot.Extensions;
|
using Game.Godot.Extensions;
|
||||||
using Game.Godot.Mappings;
|
using Game.Godot.Mappings;
|
||||||
@@ -8,7 +9,7 @@ using Godot;
|
|||||||
|
|
||||||
namespace Game.Features.Console.Godot;
|
namespace Game.Features.Console.Godot;
|
||||||
|
|
||||||
public partial class ConsoleController : CanvasLayer
|
public partial class ConsoleController : CanvasLayer, ILogTarget
|
||||||
{
|
{
|
||||||
[Export] public LineEdit CommandInput;
|
[Export] public LineEdit CommandInput;
|
||||||
[Export] public RichTextLabel OutputLog;
|
[Export] public RichTextLabel OutputLog;
|
||||||
@@ -33,16 +34,6 @@ public partial class ConsoleController : CanvasLayer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AppendLine(string line)
|
|
||||||
{
|
|
||||||
OutputLog.AppendText(line + "\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void UseCommandRegistry(ICommandRegistry registry)
|
|
||||||
{
|
|
||||||
_commandExecute = new CommandExecute(registry);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnInputSubmitted(string text)
|
private void OnInputSubmitted(string text)
|
||||||
{
|
{
|
||||||
CommandInput.Clear();
|
CommandInput.Clear();
|
||||||
@@ -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()
|
public override void _Ready()
|
||||||
{
|
{
|
||||||
this.AssertRequiredExports();
|
this.AssertRequiredExports();
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
using Game.Features.Interactions.Contracts;
|
||||||
|
|
||||||
|
namespace Game.Features.Interactions.Application;
|
||||||
|
|
||||||
|
public sealed class Interact(IInteractionRegistry registry) : IInteractionHandler
|
||||||
|
{
|
||||||
|
public InteractionResult TryInteract(InteractionRequest request)
|
||||||
|
{
|
||||||
|
if (!registry.TryGetTarget(request.TargetId, out IInteractionTarget 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://b1m7q4y9c5v2n
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using Game.Features.Items.Contracts;
|
||||||
|
|
||||||
|
namespace Game.Features.Interactions.Application;
|
||||||
|
|
||||||
|
public readonly record struct PickupAvailability(bool LeftHand, bool RightHand, bool RequiresBoth);
|
||||||
|
|
||||||
|
public sealed class ResolvePickupAvailability
|
||||||
|
{
|
||||||
|
public PickupAvailability Resolve(HandRequirement requirement, bool leftHandFree, bool rightHandFree)
|
||||||
|
{
|
||||||
|
if (requirement == HandRequirement.Both)
|
||||||
|
{
|
||||||
|
bool canUseBoth = leftHandFree && rightHandFree;
|
||||||
|
return new PickupAvailability(canUseBoth, canUseBoth, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new PickupAvailability(leftHandFree, rightHandFree, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://c6mhpn06a47qu
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Game.Features.Interactions.Contracts;
|
||||||
|
|
||||||
|
public interface IInteractionHandler
|
||||||
|
{
|
||||||
|
InteractionResult TryInteract(InteractionRequest request);
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://a3n8v5r1q7m9c
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace Game.Features.Interactions.Contracts;
|
||||||
|
|
||||||
|
public interface IInteractionRegistry
|
||||||
|
{
|
||||||
|
void Register(IInteractionTarget target);
|
||||||
|
void Unregister(InteractionTargetId targetId);
|
||||||
|
bool TryGetTarget(InteractionTargetId targetId, out IInteractionTarget target);
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://baejppnflmpnn
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
using Game.Features.Players.Contracts;
|
||||||
|
|
||||||
|
namespace Game.Features.Interactions.Contracts;
|
||||||
|
|
||||||
|
public interface IInteractionTarget
|
||||||
|
{
|
||||||
|
InteractionTargetId InteractionTargetId { get; }
|
||||||
|
bool CanInteract { get; }
|
||||||
|
InteractionPrompt Prompt { get; }
|
||||||
|
|
||||||
|
InteractionResult Execute(PlayerId playerId);
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://c7p2y5n8f1v6m
|
||||||
@@ -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,10 @@
|
|||||||
|
using Game.Shared.Domain;
|
||||||
|
|
||||||
|
namespace Game.Features.Interactions.Contracts;
|
||||||
|
|
||||||
|
public readonly record struct InteractionTargetId(InstanceId Value)
|
||||||
|
{
|
||||||
|
public static InteractionTargetId From(InstanceId value) => new(value);
|
||||||
|
|
||||||
|
public override string ToString() => Value.ToString();
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://c6m1v8q4r9x2k
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
using Godot;
|
||||||
|
|
||||||
|
namespace Game.Features.Interactions.Domain;
|
||||||
|
|
||||||
|
public readonly record struct DropRayHit(
|
||||||
|
Vector3 Origin,
|
||||||
|
Vector3 Direction,
|
||||||
|
float RayLength,
|
||||||
|
bool IsBlocked,
|
||||||
|
Vector3 BlockPoint
|
||||||
|
);
|
||||||
|
|
||||||
|
public static class DropPosition
|
||||||
|
{
|
||||||
|
public static Vector3 CalculateFrom(DropRayHit hit)
|
||||||
|
{
|
||||||
|
float distance = hit.RayLength;
|
||||||
|
|
||||||
|
if (hit.IsBlocked)
|
||||||
|
{
|
||||||
|
distance = Mathf.Max(0.25f, hit.Origin.DistanceTo(hit.BlockPoint) - 0.2f);
|
||||||
|
}
|
||||||
|
|
||||||
|
return hit.Origin + hit.Direction * distance;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://derjakse05m3d
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
using Game.Features.Interactions.Contracts;
|
||||||
|
using Game.Features.Players.Contracts;
|
||||||
|
using Game.Godot.Extensions;
|
||||||
|
using Godot;
|
||||||
|
using Godot.Collections;
|
||||||
|
|
||||||
|
namespace Game.Features.Interactions.Godot;
|
||||||
|
|
||||||
|
public abstract partial class InteractableController : Node3D, IInteractionTarget
|
||||||
|
{
|
||||||
|
public const string InteractionGroup = "interactions";
|
||||||
|
|
||||||
|
[Export]
|
||||||
|
public string InstanceKey;
|
||||||
|
|
||||||
|
[Export]
|
||||||
|
public string PromptText = "Wejdź w interakcję";
|
||||||
|
|
||||||
|
public InteractionTargetId InteractionTargetId { get; private set; }
|
||||||
|
public virtual bool CanInteract => true;
|
||||||
|
public InteractionPrompt Prompt => new(PromptText);
|
||||||
|
|
||||||
|
private InteractionsRegistryController _registry;
|
||||||
|
|
||||||
|
private void RegisterWithAvailableRegistry()
|
||||||
|
{
|
||||||
|
Array<Node> availableRegistries = GetTree()
|
||||||
|
.GetNodesInGroup(InteractionsRegistryController.RegistryGroup);
|
||||||
|
|
||||||
|
foreach (Node node in availableRegistries)
|
||||||
|
{
|
||||||
|
if (node is InteractionsRegistryController registry)
|
||||||
|
{
|
||||||
|
registry.Register(this);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void UseRegistry(InteractionsRegistryController registry)
|
||||||
|
{
|
||||||
|
_registry = registry;
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract InteractionResult Execute(PlayerId playerId);
|
||||||
|
|
||||||
|
public override void _ExitTree()
|
||||||
|
{
|
||||||
|
_registry?.Unregister(InteractionTargetId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void _Ready()
|
||||||
|
{
|
||||||
|
InteractionTargetId = InteractionTargetId.From(this.GetStableInstanceIdFrom(InstanceKey));
|
||||||
|
AddToGroup(InteractionGroup);
|
||||||
|
RegisterWithAvailableRegistry();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://bh0e1kwa1i4r
|
||||||
@@ -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 GetTargetOrNull<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,47 @@
|
|||||||
|
using Game.Features.Interactions.Contracts;
|
||||||
|
using Godot;
|
||||||
|
using GodotNodeArray = Godot.Collections.Array<Godot.Node>;
|
||||||
|
|
||||||
|
namespace Game.Features.Interactions.Godot;
|
||||||
|
|
||||||
|
public partial class InteractionsRegistryController : Node
|
||||||
|
{
|
||||||
|
public const string RegistryGroup = "interactions_registry";
|
||||||
|
|
||||||
|
private IInteractionRegistry _registry;
|
||||||
|
|
||||||
|
private GodotNodeArray GetInteractionTargetNodesInScene() =>
|
||||||
|
GetTree().GetNodesInGroup(InteractableController.InteractionGroup);
|
||||||
|
|
||||||
|
public override void _EnterTree()
|
||||||
|
{
|
||||||
|
AddToGroup(RegistryGroup);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void UseRegistry(IInteractionRegistry registry)
|
||||||
|
{
|
||||||
|
_registry = registry;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RegisterSceneTargets()
|
||||||
|
{
|
||||||
|
foreach (Node node in GetInteractionTargetNodesInScene())
|
||||||
|
{
|
||||||
|
if (node is InteractableController target)
|
||||||
|
{
|
||||||
|
Register(target);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Register(InteractableController target)
|
||||||
|
{
|
||||||
|
_registry.Register(target);
|
||||||
|
target.UseRegistry(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Unregister(InteractionTargetId targetId)
|
||||||
|
{
|
||||||
|
_registry.Unregister(targetId);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://f6q1c9m4w7v2n
|
||||||
@@ -0,0 +1,243 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using Game.Features.Interactions.Application;
|
||||||
|
using Game.Features.Interactions.Contracts;
|
||||||
|
using Game.Features.Interactions.Domain;
|
||||||
|
using Game.Features.Items.Contracts;
|
||||||
|
using Game.Features.Players.Contracts;
|
||||||
|
using Game.Godot;
|
||||||
|
using Game.Godot.Exceptions;
|
||||||
|
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 IInteractionHandler _interactions;
|
||||||
|
private PlayerId _playerId;
|
||||||
|
private readonly HashSet<Hand> _dropActions = [];
|
||||||
|
private readonly ResolvePickupAvailability _resolvePickupAvailability = new();
|
||||||
|
|
||||||
|
private ItemUseRequest CreateUseRequest(Hand hand, ItemActionPhase phase)
|
||||||
|
{
|
||||||
|
InteractionTargetId? targetId = InteractionRaycaster
|
||||||
|
.GetTargetOrNull<IInteractionTarget>()
|
||||||
|
?.InteractionTargetId;
|
||||||
|
|
||||||
|
return new ItemUseRequest(_playerId, hand, phase, targetId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ProcessHandActionStarted(Hand hand)
|
||||||
|
{
|
||||||
|
if (Input.IsActionPressed(InputAction.DropModifier.ActionName()))
|
||||||
|
{
|
||||||
|
_items.TryUse(new ItemUseRequest(_playerId, hand, ItemActionPhase.Cancelled));
|
||||||
|
_items.TryDrop(hand, CalculateDropPosition());
|
||||||
|
_dropActions.Add(hand);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_items.IsHandFree(hand))
|
||||||
|
{
|
||||||
|
_items.TryUse(CreateUseRequest(hand, ItemActionPhase.Started));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
IPickupTarget target = InteractionRaycaster.GetTargetOrNull<IPickupTarget>();
|
||||||
|
if (target is not null)
|
||||||
|
{
|
||||||
|
_items.TryPickup(target.ItemInfo.Id, hand);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ProcessHandActionCompleted(Hand hand)
|
||||||
|
{
|
||||||
|
if (_dropActions.Remove(hand))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_items.TryUse(new ItemUseRequest(_playerId, hand, ItemActionPhase.Completed));
|
||||||
|
}
|
||||||
|
|
||||||
|
private Vector3 CalculateDropPosition()
|
||||||
|
{
|
||||||
|
DropRaycaster.ForceRaycastUpdate();
|
||||||
|
|
||||||
|
bool isBlocked = DropRaycaster.IsColliding();
|
||||||
|
DropRayHit hit = new(
|
||||||
|
Camera.GlobalPosition,
|
||||||
|
-Camera.GlobalBasis.Z.Normalized(),
|
||||||
|
DropRaycaster.TargetPosition.Length(),
|
||||||
|
isBlocked,
|
||||||
|
isBlocked ? DropRaycaster.GetCollisionPoint() : default
|
||||||
|
);
|
||||||
|
|
||||||
|
return DropPosition.CalculateFrom(hit);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdatePrompt()
|
||||||
|
{
|
||||||
|
IPickupTarget pickupTarget = InteractionRaycaster.GetTargetOrNull<IPickupTarget>();
|
||||||
|
if (pickupTarget is not null)
|
||||||
|
{
|
||||||
|
ShowPickupPrompt(pickupTarget.ItemInfo);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
IInteractionTarget interactionTarget = InteractionRaycaster.GetTargetOrNull<IInteractionTarget>();
|
||||||
|
if (interactionTarget?.CanInteract == true)
|
||||||
|
{
|
||||||
|
PromptController.ShowPrompt($"[E] {interactionTarget.Prompt.Text}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
PromptController.Clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ShowPickupPrompt(ItemInfo itemInfo)
|
||||||
|
{
|
||||||
|
PickupAvailability availability = _resolvePickupAvailability.Resolve(
|
||||||
|
itemInfo.HandRequirement,
|
||||||
|
_items.IsHandFree(Hand.Left),
|
||||||
|
_items.IsHandFree(Hand.Right)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (availability.RequiresBoth)
|
||||||
|
{
|
||||||
|
PromptController.ShowPrompt(
|
||||||
|
availability.LeftHand
|
||||||
|
? $"[LPM lub PPM] Podnieś {itemInfo.DisplayName} — obie ręce"
|
||||||
|
: "Potrzebujesz obu wolnych rąk"
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<string> actions = [];
|
||||||
|
|
||||||
|
if (availability.LeftHand)
|
||||||
|
{
|
||||||
|
actions.Add($"[LPM] Podnieś {itemInfo.DisplayName} — lewa ręka");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (availability.RightHand)
|
||||||
|
{
|
||||||
|
actions.Add($"[PPM] Podnieś {itemInfo.DisplayName} — prawa ręka");
|
||||||
|
}
|
||||||
|
|
||||||
|
PromptController.ShowPrompt(
|
||||||
|
actions.Count > 0 ? string.Join("\n", actions) : "Brak wolnej ręki"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Initialize(
|
||||||
|
PlayerId playerId,
|
||||||
|
IItemInteractionService items,
|
||||||
|
IInteractionHandler interactions
|
||||||
|
)
|
||||||
|
{
|
||||||
|
_playerId = playerId;
|
||||||
|
_items = items;
|
||||||
|
_interactions = interactions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Vector3 GetItemSpawnPosition() => CalculateDropPosition();
|
||||||
|
|
||||||
|
public override void _Ready()
|
||||||
|
{
|
||||||
|
this.AssertRequiredExports();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void _Process(double delta)
|
||||||
|
{
|
||||||
|
if (_items is null || _interactions is null)
|
||||||
|
{
|
||||||
|
throw new ControllerNotInitializedException(Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (GamePause.IsPaused || !MouseCapture.IsCaptured)
|
||||||
|
{
|
||||||
|
PromptController.Clear();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdatePrompt();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void _UnhandledInput(InputEvent @event)
|
||||||
|
{
|
||||||
|
if (_items is null || _interactions is null)
|
||||||
|
{
|
||||||
|
throw new ControllerNotInitializedException(Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (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.GetTargetOrNull<IInteractionTarget>();
|
||||||
|
if (target?.CanInteract == true)
|
||||||
|
{
|
||||||
|
_interactions.TryInteract(
|
||||||
|
new InteractionRequest(_playerId, target.InteractionTargetId)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
GetViewport().SetInputAsHandled();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://c2v8m5r1y7q4d
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Game.Features.Interactions.Contracts;
|
||||||
|
|
||||||
|
namespace Game.Features.Interactions.Infrastructure;
|
||||||
|
|
||||||
|
public sealed class InteractionRegistry : IInteractionRegistry
|
||||||
|
{
|
||||||
|
private readonly Dictionary<InteractionTargetId, IInteractionTarget> _interactionTargetsById =
|
||||||
|
[];
|
||||||
|
|
||||||
|
public void Register(IInteractionTarget target)
|
||||||
|
{
|
||||||
|
if (
|
||||||
|
_interactionTargetsById.TryGetValue(
|
||||||
|
target.InteractionTargetId,
|
||||||
|
out IInteractionTarget existing
|
||||||
|
)
|
||||||
|
)
|
||||||
|
{
|
||||||
|
if (ReferenceEquals(existing, target))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
$"Duplicate interaction target id: {target.InteractionTargetId}."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
_interactionTargetsById.Add(target.InteractionTargetId, target);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Unregister(InteractionTargetId targetId)
|
||||||
|
{
|
||||||
|
_interactionTargetsById.Remove(targetId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool TryGetTarget(InteractionTargetId targetId, out IInteractionTarget target) =>
|
||||||
|
_interactionTargetsById.TryGetValue(targetId, out target);
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://dtnwqalxdu6n2
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using Game.Features.Interactions.Contracts;
|
||||||
|
using Game.Features.Items.Contracts;
|
||||||
|
using Game.Features.Items.Domain;
|
||||||
|
using Godot;
|
||||||
|
|
||||||
|
namespace Game.Features.Items.Application;
|
||||||
|
|
||||||
|
public sealed class ItemInteractionService(
|
||||||
|
HandsInventory hands,
|
||||||
|
IItemInstanceRegistry itemRegistry,
|
||||||
|
IHeldItemPresenter presenter
|
||||||
|
) : IItemInteractionService
|
||||||
|
{
|
||||||
|
private readonly Dictionary<Hand, InteractionTargetId?> _activeUseTargets = [];
|
||||||
|
|
||||||
|
public bool IsHandFree(Hand hand) => hands.IsFree(hand);
|
||||||
|
|
||||||
|
public ItemInstanceId? GetHeldItem(Hand hand) => hands.Get(hand);
|
||||||
|
|
||||||
|
public ItemActionResult TryPickup(ItemInstanceId itemId, Hand hand)
|
||||||
|
{
|
||||||
|
if (!itemRegistry.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)
|
||||||
|
{
|
||||||
|
if (request.Phase == ItemActionPhase.Started)
|
||||||
|
{
|
||||||
|
ItemActionResult startResult = ExecuteUse(request);
|
||||||
|
if (startResult.Success)
|
||||||
|
{
|
||||||
|
_activeUseTargets[request.Hand] = request.TargetId;
|
||||||
|
}
|
||||||
|
|
||||||
|
return startResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_activeUseTargets.Remove(request.Hand, out InteractionTargetId? activeTargetId))
|
||||||
|
{
|
||||||
|
return ItemActionResult.Ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
return ExecuteUse(request with { TargetId = activeTargetId });
|
||||||
|
}
|
||||||
|
|
||||||
|
private ItemActionResult ExecuteUse(ItemUseRequest request)
|
||||||
|
{
|
||||||
|
ItemInstanceId? itemId = hands.Get(request.Hand);
|
||||||
|
if (itemId is null)
|
||||||
|
{
|
||||||
|
return ItemActionResult.Fail(ItemActionStatus.HandEmpty, "The requested hand is empty.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!itemRegistry.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 (!itemRegistry.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
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Game.Features.Items.Contracts;
|
||||||
|
|
||||||
|
public enum Hand
|
||||||
|
{
|
||||||
|
Left,
|
||||||
|
Right
|
||||||
|
}
|
||||||
@@ -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,10 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace Game.Features.Items.Contracts;
|
||||||
|
|
||||||
|
public interface IItemDefinitionRegistry
|
||||||
|
{
|
||||||
|
IReadOnlyCollection<ItemDefinitionId> DefinitionIds { get; }
|
||||||
|
bool TryRegister(ItemDefinitionId definitionId, ItemDefinition definition);
|
||||||
|
bool TryGetDefinition(ItemDefinitionId definitionId, out ItemDefinition definition);
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://kjka28plyqeo
|
||||||
@@ -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,8 @@
|
|||||||
|
namespace Game.Features.Items.Contracts;
|
||||||
|
|
||||||
|
public interface IItemInstanceRegistry
|
||||||
|
{
|
||||||
|
void Register(ItemInstanceId itemId, IItemInstance item);
|
||||||
|
void Unregister(ItemInstanceId itemId);
|
||||||
|
bool TryGet(ItemInstanceId itemId, out IItemInstance item);
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://s83yytevpj52
|
||||||
@@ -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,8 @@
|
|||||||
|
using Godot;
|
||||||
|
|
||||||
|
namespace Game.Features.Items.Contracts;
|
||||||
|
|
||||||
|
public interface IItemSpawnPoint
|
||||||
|
{
|
||||||
|
Vector3 GetItemSpawnPosition();
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://a2v6r8m3q7k5d
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
using Godot;
|
||||||
|
|
||||||
|
namespace Game.Features.Items.Contracts;
|
||||||
|
|
||||||
|
public interface IItemSpawner
|
||||||
|
{
|
||||||
|
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
|
||||||
@@ -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,10 @@
|
|||||||
|
using Game.Shared.Domain;
|
||||||
|
|
||||||
|
namespace Game.Features.Items.Contracts;
|
||||||
|
|
||||||
|
public readonly record struct ItemInstanceId(InstanceId Value)
|
||||||
|
{
|
||||||
|
public static ItemInstanceId From(InstanceId value) => new(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 : ItemController
|
||||||
|
{
|
||||||
|
[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,42 @@
|
|||||||
|
using Game.Features.Items.Contracts;
|
||||||
|
using Godot;
|
||||||
|
|
||||||
|
namespace Game.Features.Items.Godot;
|
||||||
|
|
||||||
|
public sealed class HeldItemPresenter(
|
||||||
|
ItemControllerRegistryController itemWorld,
|
||||||
|
Node3D leftHandAnchor,
|
||||||
|
Node3D rightHandAnchor
|
||||||
|
) : IHeldItemPresenter
|
||||||
|
{
|
||||||
|
public bool TryShowHeld(IItemInstance item, Hand hand)
|
||||||
|
{
|
||||||
|
if (!itemWorld.TryGetController(item.Info.Id, out ItemController 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 ItemController controller))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
controller.SetDropped(worldPosition, item);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Refresh(IItemInstance item)
|
||||||
|
{
|
||||||
|
if (itemWorld.TryGetController(item.Info.Id, out ItemController controller))
|
||||||
|
{
|
||||||
|
controller.ApplyState(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://e5m2r8q1v7k4n
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
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 ItemController : RigidBody3D, IPickupTarget
|
||||||
|
{
|
||||||
|
public const string ItemGroup = "world_items";
|
||||||
|
|
||||||
|
[Export]
|
||||||
|
public string InstanceKey;
|
||||||
|
|
||||||
|
[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 ItemControllerRegistryController _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.");
|
||||||
|
}
|
||||||
|
|
||||||
|
Definition = new ItemDefinition(
|
||||||
|
new ItemDefinitionId(DefinitionId),
|
||||||
|
DisplayName,
|
||||||
|
HandRequirement
|
||||||
|
);
|
||||||
|
ItemInfo = new ItemInfo(
|
||||||
|
ItemInstanceId.From(this.GetStableInstanceIdFrom(InstanceKey)),
|
||||||
|
Definition.Id,
|
||||||
|
Definition.DisplayName,
|
||||||
|
Definition.HandRequirement
|
||||||
|
);
|
||||||
|
Item = CreateItemInstance(ItemInfo);
|
||||||
|
AddToGroup(ItemGroup);
|
||||||
|
ApplyState(Item);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void _ExitTree()
|
||||||
|
{
|
||||||
|
_registry?.Unregister(ItemInfo.Id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RegisterWith(ItemControllerRegistryController 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) { }
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://d1x7m4q9v2c6k
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Game.Features.Items.Contracts;
|
||||||
|
using Godot;
|
||||||
|
|
||||||
|
namespace Game.Features.Items.Godot;
|
||||||
|
|
||||||
|
public partial class ItemControllerRegistryController : Node
|
||||||
|
{
|
||||||
|
private IItemInstanceRegistry _registry;
|
||||||
|
private readonly Dictionary<ItemInstanceId, ItemController> _items = [];
|
||||||
|
|
||||||
|
public IReadOnlyCollection<ItemController> Items => _items.Values;
|
||||||
|
|
||||||
|
public void UseRegistry(IItemInstanceRegistry registry)
|
||||||
|
{
|
||||||
|
_registry = registry;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RegisterSceneItems()
|
||||||
|
{
|
||||||
|
foreach (Node node in GetTree().GetNodesInGroup(ItemController.ItemGroup))
|
||||||
|
{
|
||||||
|
if (node is ItemController item)
|
||||||
|
{
|
||||||
|
Register(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Register(ItemController item)
|
||||||
|
{
|
||||||
|
if (_items.TryGetValue(item.ItemInfo.Id, out ItemController existing))
|
||||||
|
{
|
||||||
|
if (ReferenceEquals(existing, item))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new InvalidOperationException($"Duplicate item instance id: {item.ItemInfo.Id}.");
|
||||||
|
}
|
||||||
|
|
||||||
|
_items.Add(item.ItemInfo.Id, item);
|
||||||
|
_registry.Register(item.ItemInfo.Id, item.Item);
|
||||||
|
item.RegisterWith(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Unregister(ItemInstanceId itemId)
|
||||||
|
{
|
||||||
|
_items.Remove(itemId);
|
||||||
|
_registry.Unregister(itemId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool TryGetController(ItemInstanceId itemId, out ItemController controller)
|
||||||
|
{
|
||||||
|
return _items.TryGetValue(itemId, out controller);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://f8n3b6w1k5r9m
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user