From 9956c8a1c40dee8b05aba6d246f8caaacb9ed755 Mon Sep 17 00:00:00 2001 From: LP Date: Fri, 15 Sep 2023 12:59:42 +0100 Subject: [PATCH] Fixed some issues with file names --- .../Processors/Attacks/IAttackProcessor.cs | 5 ++--- src/OpenRpg.Core/OpenRpg.Core.csproj | 1 + .../State/Entity/IEntityStateVariables.cs | 2 -- ...eVariables.cs => DefaultEntityStatsVariables.cs} | 0 .../Stats/Entity/IEntityStateVariables.cs | 2 -- src/OpenRpg.Core/Stats/IHasStats.cs | 2 -- .../Stats/Variables/DefaultStatsVariables.cs | 13 ------------- src/OpenRpg.Core/Types/CoreVariableTypes.cs | 2 +- 8 files changed, 4 insertions(+), 23 deletions(-) rename src/OpenRpg.Core/Stats/Entity/{DefaultEntityStateVariables.cs => DefaultEntityStatsVariables.cs} (100%) delete mode 100644 src/OpenRpg.Core/Stats/Variables/DefaultStatsVariables.cs diff --git a/src/OpenRpg.Combat/Processors/Attacks/IAttackProcessor.cs b/src/OpenRpg.Combat/Processors/Attacks/IAttackProcessor.cs index af68c23..c64486e 100644 --- a/src/OpenRpg.Combat/Processors/Attacks/IAttackProcessor.cs +++ b/src/OpenRpg.Combat/Processors/Attacks/IAttackProcessor.cs @@ -1,11 +1,10 @@ using OpenRpg.Combat.Attacks; using OpenRpg.Core.Stats; -using OpenRpg.Core.Stats.Variables; namespace OpenRpg.Combat.Processors.Attacks { - public interface IAttackProcessor + public interface IAttackProcessor where T : IStatsVariables { - ProcessedAttack ProcessAttack(Attack attack, IStatsVariables stats); + ProcessedAttack ProcessAttack(Attack attack, T stats); } } \ No newline at end of file diff --git a/src/OpenRpg.Core/OpenRpg.Core.csproj b/src/OpenRpg.Core/OpenRpg.Core.csproj index a1f559d..e4fa29c 100644 --- a/src/OpenRpg.Core/OpenRpg.Core.csproj +++ b/src/OpenRpg.Core/OpenRpg.Core.csproj @@ -10,6 +10,7 @@ An open source set of base components to build RPG games rpg game-development xna monogame unity godot 8 + diff --git a/src/OpenRpg.Core/State/Entity/IEntityStateVariables.cs b/src/OpenRpg.Core/State/Entity/IEntityStateVariables.cs index a0ed2f5..97fd63c 100644 --- a/src/OpenRpg.Core/State/Entity/IEntityStateVariables.cs +++ b/src/OpenRpg.Core/State/Entity/IEntityStateVariables.cs @@ -1,5 +1,3 @@ -using OpenRpg.Core.Stats.Variables; - namespace OpenRpg.Core.State.Entity { public interface IEntityStateVariables : IStateVariables diff --git a/src/OpenRpg.Core/Stats/Entity/DefaultEntityStateVariables.cs b/src/OpenRpg.Core/Stats/Entity/DefaultEntityStatsVariables.cs similarity index 100% rename from src/OpenRpg.Core/Stats/Entity/DefaultEntityStateVariables.cs rename to src/OpenRpg.Core/Stats/Entity/DefaultEntityStatsVariables.cs diff --git a/src/OpenRpg.Core/Stats/Entity/IEntityStateVariables.cs b/src/OpenRpg.Core/Stats/Entity/IEntityStateVariables.cs index 2f72d94..f011920 100644 --- a/src/OpenRpg.Core/Stats/Entity/IEntityStateVariables.cs +++ b/src/OpenRpg.Core/Stats/Entity/IEntityStateVariables.cs @@ -1,5 +1,3 @@ -using OpenRpg.Core.Stats.Variables; - namespace OpenRpg.Core.Stats.Entity { public interface IEntityStatsVariables : IStatsVariables diff --git a/src/OpenRpg.Core/Stats/IHasStats.cs b/src/OpenRpg.Core/Stats/IHasStats.cs index 95691c7..445567e 100644 --- a/src/OpenRpg.Core/Stats/IHasStats.cs +++ b/src/OpenRpg.Core/Stats/IHasStats.cs @@ -1,5 +1,3 @@ -using OpenRpg.Core.Stats.Variables; - namespace OpenRpg.Core.Stats { public interface IHasStats where T : IStatsVariables diff --git a/src/OpenRpg.Core/Stats/Variables/DefaultStatsVariables.cs b/src/OpenRpg.Core/Stats/Variables/DefaultStatsVariables.cs deleted file mode 100644 index 6e080ce..0000000 --- a/src/OpenRpg.Core/Stats/Variables/DefaultStatsVariables.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; -using OpenRpg.Core.Types; -using OpenRpg.Core.Variables; - -namespace OpenRpg.Core.Stats.Variables -{ - public class DefaultStatsVariables : DefaultVariables, IStatsVariables - { - public DefaultStatsVariables(IDictionary internalVariables = null) : base(CoreVariableTypes.StatsVariables, internalVariables) - { - } - } -} \ No newline at end of file diff --git a/src/OpenRpg.Core/Types/CoreVariableTypes.cs b/src/OpenRpg.Core/Types/CoreVariableTypes.cs index 7840d42..46200c3 100644 --- a/src/OpenRpg.Core/Types/CoreVariableTypes.cs +++ b/src/OpenRpg.Core/Types/CoreVariableTypes.cs @@ -6,7 +6,7 @@ public interface CoreVariableTypes public static int Unknown = 0; // Base Types - public static int StatsVariables = 1; + public static int EntityStatsVariables = 1; public static int RaceTemplateVariables = 2; public static int ClassTemplateVariables = 3; public static int ClassVariables = 4;