Skip to content

Commit

Permalink
Move Conversations to Dialogs namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaioru committed Oct 2, 2024
1 parent 5250edd commit 78ef594
Show file tree
Hide file tree
Showing 50 changed files with 123 additions and 122 deletions.
4 changes: 2 additions & 2 deletions src/app/Edelstein.Application.Server/ProgramHostBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using Edelstein.Common.Database.Sqlite;
using Edelstein.Common.Gameplay.Game;
using Edelstein.Common.Gameplay.Game.Continent;
using Edelstein.Common.Gameplay.Game.Conversations;
using Edelstein.Common.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Common.Gameplay.Game.Items.Options;
using Edelstein.Common.Gameplay.Game.Objects.Users.Stats;
using Edelstein.Common.Gameplay.Handling;
Expand All @@ -27,7 +27,7 @@
using Edelstein.Protocol.Gameplay.Game;
using Edelstein.Protocol.Gameplay.Game.Contexts;
using Edelstein.Protocol.Gameplay.Game.Continents;
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Items;
using Edelstein.Protocol.Gameplay.Game.Items.Options;
using Edelstein.Protocol.Gameplay.Game.Objects.Users.Stats;
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
using System.Threading;
using System.Threading.Channels;
using System.Threading.Tasks;
using Edelstein.Common.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Network;

namespace Edelstein.Common.Gameplay.Game.Conversations;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations;

public class ConversationContext(
ISocketUser user
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Edelstein.Common.Utilities.Repositories;
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations;

public class ConversationManager<TSelf, TTarget> :
Repository<string, IConversationManagerEntry<TSelf, TTarget>>,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;

namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAnswer<T>(
ConversationMessageType Type,
T Value
) : IConversationMessageAnswer<T>;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAskAccept(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAskAvatar(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAskBoxText(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAskMemberShopAvatar(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Collections.Generic;
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAskMenu(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAskNumber(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Collections.Generic;
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAskSlideMenu(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAskText(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageAskYesNo(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Linq;
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Network.Packets.Types;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public static class ConversationMessageExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageSay(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Messages;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;

public record ConversationMessageSayImage(
IConversationSpeaker Speaker,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Collections.Generic;
using Edelstein.Common.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations.Speakers;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Speakers;

public class ConversationSpeaker(
IConversationContext context,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Objects.NPC;

namespace Edelstein.Common.Gameplay.Game.Conversations.Speakers;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Speakers;

public class ConversationSpeakerNPC(
IConversationContext context,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Speakers;

public class ConversationSpeakerPortal(
IConversationContext context,
ConversationSpeakerParam @params = 0
) : ConversationSpeaker(context, @params: @params),
IConversationSpeakerPortal;
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Objects.Users;

namespace Edelstein.Common.Gameplay.Game.Conversations.Speakers;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Speakers;

public class ConversationSpeakerUser(
IConversationContext context,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System.Threading.Tasks;
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Common.Gameplay.Game.Conversations;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations;

public class SystemConversation(
Action<IConversationSpeaker, IConversationSpeaker> action
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Threading.Tasks;
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Objects.Users;

namespace Edelstein.Common.Gameplay.Game.Conversations;
namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations;

public class SystemConversationFallback<TSelf, TTarget>(
string script,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Combat\" />
<Folder Include="Dialogs\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Stateless" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Linq;
using System.Threading.Tasks;
using Edelstein.Common.Gameplay.Game.Conversations;
using Edelstein.Common.Gameplay.Game.Conversations.Speakers;
using Edelstein.Common.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Contracts.Packets.Recv;
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;
using Edelstein.Protocol.Utilities.Pipelines;

namespace Edelstein.Common.Gameplay.Game.Handling.Pipes;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System.Threading.Tasks;
using Edelstein.Common.Gameplay.Game.Conversations.Messages;
using Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Contracts.Packets.Recv;
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;
using Edelstein.Protocol.Network.Packets.Types;
using Edelstein.Protocol.Utilities.Pipelines;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Linq;
using System.Threading.Tasks;
using Edelstein.Common.Gameplay.Game.Conversations;
using Edelstein.Common.Gameplay.Game.Conversations.Speakers;
using Edelstein.Common.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Contracts.Packets.Recv;
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Objects;
using Edelstein.Protocol.Gameplay.Game.Objects.NPC;
using Edelstein.Protocol.Utilities.Pipelines;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Edelstein.Protocol.Gameplay.Game.Conversations;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Protocol.Gameplay.Game.Contexts;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;

namespace Edelstein.Protocol.Gameplay.Game.Contracts.Packets.Recv;

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;

namespace Edelstein.Protocol.Gameplay.Game.Conversations;
namespace Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;

public interface IConversation<in TSelf, in TTarget>
where TSelf : IConversationSpeaker
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Edelstein.Protocol.Gameplay.Game.Conversations.Messages;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Messages;

namespace Edelstein.Protocol.Gameplay.Game.Conversations;
namespace Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;

public interface IConversationContext : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;
using Edelstein.Protocol.Utilities.Repositories.Methods;

namespace Edelstein.Protocol.Gameplay.Game.Conversations;
namespace Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;

public interface IConversationManager<TSelf, TTarget> :
IRepositoryMethodRetrieve<string, IConversationManagerEntry<TSelf, TTarget>>,
Expand Down
Loading

0 comments on commit 78ef594

Please sign in to comment.