Add Resource Interface so client plugins can figure out the base reso…

…urce (#934) * Add Resource Interface so client plugins can figure out the base resource * Expose IsDead as IsDepleted for resources, remove setter from BaseResource on IResource
AscensionGameDev · Oct 9, 2021 · d39d457 · d39d457
1 parent 6c25384
commit d39d457
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/Intersect.Client.Framework/Entities/IResource.cs b/Intersect.Client.Framework/Entities/IResource.cs
@@ -0,0 +1,12 @@
+using Intersect.GameObjects;
+
+namespace Intersect.Client.Framework.Entities
+{
+    public interface IResource : IEntity
+    {
+        ResourceBase BaseResource { get; }
+
+        bool IsDepleted { get; }
+
+    }
+}
diff --git a/Intersect.Client.Framework/Intersect.Client.Framework.csproj b/Intersect.Client.Framework/Intersect.Client.Framework.csproj
@@ -95,6 +95,7 @@
     <Compile Include="Entities\IHotbarInstance.cs" />
     <Compile Include="Entities\IPartyMember.cs" />
     <Compile Include="Entities\IPlayer.cs" />
+    <Compile Include="Entities\IResource.cs" />
     <Compile Include="Entities\IStatus.cs" />
     <Compile Include="Entities\Label.cs" />
     <Compile Include="Entities\LabelType.cs" />

diff --git a/Intersect.Client/Entities/Entity.cs b/Intersect.Client/Entities/Entity.cs
@@ -1987,7 +1987,7 @@ public void LoadAnimationTextures(string tex)
                             {
                                 if (en.Value.GetType() == typeof(Resource))
                                 {
-                                    var resourceBase = ((Resource)en.Value).GetResourceBase();
+                                    var resourceBase = ((Resource)en.Value).BaseResource;
                                     if (resourceBase != null)
                                     {
                                         if (!ignoreAliveResources && !((Resource)en.Value).IsDead)

diff --git a/Intersect.Client/Entities/Resource.cs b/Intersect.Client/Entities/Resource.cs
@@ -15,14 +15,16 @@
 namespace Intersect.Client.Entities
 {
 
-    public partial class Resource : Entity
+    public partial class Resource : Entity, IResource
     {
 
         private bool _waitingForTilesets;
 
-        public ResourceBase BaseResource;
+        public ResourceBase BaseResource { get; set; }
 
-        public bool IsDead;
+        bool IResource.IsDepleted => IsDead;
+
+        public bool IsDead { get; set; }
 
         FloatRect mDestRectangle = FloatRect.Empty;
 
@@ -67,11 +69,6 @@ public override string Sprite
             }
         }
 
-        public ResourceBase GetResourceBase()
-        {
-            return BaseResource;
-        }
-
         public override void Load(EntityPacket packet)
         {
             base.Load(packet);