Fixed Resource Gathering reset after exhausting the source.

scscgit · scscgit · commit 206e611062af · 2017-05-19T01:14:50.000+02:00
Updated Helper API to offer List able to use LINQ.
Worker's gathering method is now chaining.
Increased animation speed of Goblin to reduce global physics modifier.
Fixed an issue with ActionQueue error if Finished during Progress.
Resources are now properly removed from Player Model on Destroy.
Added a GatherResource constructor overload to ignore Exceptions.
diff --git a/API/Sources/Actors/Resources/ResourceExhaustedException.cs b/API/Sources/Actors/Resources/ResourceExhaustedException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace XposeCraft.Game.Actors.Resources
+{
+    public class ResourceExhaustedException : Exception
+    {
+        public ResourceExhaustedException() : base("Resource is not available for gathering anymore")
+        {
+        }
+
+        public ResourceExhaustedException(IResource resource) : base(
+            "Resource " + resource.GetType().Name + " is not available for gathering anymore")
+        {
+        }
+
+        public ResourceExhaustedException(string message) : base(message)
+        {
+        }
+    }
+}
diff --git a/API/Sources/Actors/Units/Worker.cs b/API/Sources/Actors/Units/Worker.cs
@@ -1,6 +1,7 @@
 using System;
 using XposeCraft.Game.Actors.Buildings;
 using XposeCraft.Game.Actors.Resources;
+using XposeCraft.Game.Control;
 using XposeCraft.Game.Enums;
 
 namespace XposeCraft.Game.Actors.Units
@@ -20,7 +21,7 @@ public class Worker : Unit
         /// <see cref="XposeCraft.Game.Helpers.ResourceHelper"/> provides various methods to find some.
         /// </summary>
         /// <param name="resource">Resource to be gathered.</param>
-        public void SendGather(IResource resource)
+        public UnitActionQueue SendGather(IResource resource)
         {
             throw new NotImplementedException();
         }
diff --git a/API/Sources/Control/GameActions/GatherResource.cs b/API/Sources/Control/GameActions/GatherResource.cs
@@ -1,15 +1,37 @@
 using System;
+using XposeCraft.Game.Actors.Buildings;
 using XposeCraft.Game.Actors.Resources;
+using XposeCraft.Game.Actors.Units;
 
 namespace XposeCraft.Game.Control.GameActions
 {
+    /// <summary>
+    /// Gathers a chosen Resource and returns back to the <see cref="BaseCenter"/> with collected Resources, which are
+    /// subsequenty available for spending by Player anywhere. Only <see cref="Worker"/> units can do this Action.
+    /// Throws <see cref="ResourceExhaustedException"/> if the target resource is no longer available.
+    /// </summary>
     public class GatherResource : GameAction
     {
+        /// <summary>
+        /// Gathering target Resource.
+        /// </summary>
         public IResource Gathering { get; private set; }
 
+        /// <inheritdoc cref="GatherResource"/>
+        /// <param name="resource">Resource to be gathered.</param>
+        /// <exception cref="ResourceExhaustedException">The Resource was already exhausted before the attempt to go gather it.</exception>
         public GatherResource(IResource resource)
         {
             throw new NotImplementedException();
         }
+
+        /// <inheritdoc cref="GatherResource"/>
+        /// <param name="resource">Resource to be gathered.</param>
+        /// <param name="exceptionIfExhausted">If false, won't throw the <see cref="ResourceExhaustedException"/></param>
+        /// <exception cref="ResourceExhaustedException">The Resource was already exhausted before the attempt to go gather it.</exception>
+        public GatherResource(IResource resource, bool exceptionIfExhausted)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/API/Sources/Helpers/BuildingHelper.cs b/API/Sources/Helpers/BuildingHelper.cs
@@ -14,7 +14,7 @@ public sealed class BuildingHelper : ActorHelper<IBuilding>
         /// <inheritdoc cref="GetMyBuildings{TBuilding}"/>
         /// <typeparam name="TBuilding">Type of the Building to be searched for.</typeparam>
         /// <returns>List of Buildings.</returns>
-        public static IList<TBuilding> GetMyBuildingsAsList<TBuilding>() where TBuilding : IBuilding
+        public static List<TBuilding> GetMyBuildingsAsList<TBuilding>() where TBuilding : IBuilding
         {
             throw new NotImplementedException();
         }
@@ -32,7 +32,7 @@ public static TBuilding[] GetMyBuildings<TBuilding>() where TBuilding : IBuildin
         /// <inheritdoc cref="GetVisibleEnemyBuildings{TUnit}"/>
         /// <typeparam name="TBuilding">Type of the Buildings to be searched for.</typeparam>
         /// <returns>List of Buildings</returns>
-        public static IList<TBuilding> GetVisibleEnemyBuildingsAsList<TBuilding>() where TBuilding : IBuilding
+        public static List<TBuilding> GetVisibleEnemyBuildingsAsList<TBuilding>() where TBuilding : IBuilding
         {
             throw new NotImplementedException();
         }
diff --git a/API/Sources/Helpers/ResourceHelper.cs b/API/Sources/Helpers/ResourceHelper.cs
@@ -17,7 +17,7 @@ public sealed class ResourceHelper : ActorHelper<IResource>
         /// <inheritdoc cref="GetResources{TResource}"/>
         /// <typeparam name="TResource">Type of the Resource to be searched for.</typeparam>
         /// <returns>List of resources.</returns>
-        public static IList<TResource> GetResourcesAsList<TResource>() where TResource : IResource
+        public static List<TResource> GetResourcesAsList<TResource>() where TResource : IResource
         {
             throw new NotImplementedException();
         }
@@ -60,7 +60,7 @@ public static TResource GetNearestResourceTo<TResource>(IActor actor) where TRes
         /// <param name="baseCenter">Base near which all nearest resources will be looked for.</param>
         /// <typeparam name="TResource">Type of the Resource to be searched for.</typeparam>
         /// <returns>List of resources.</returns>
-        public static IList<TResource> GetResourcesNearBase<TResource>(BaseCenter baseCenter)
+        public static List<TResource> GetResourcesNearBase<TResource>(BaseCenter baseCenter)
             where TResource : IResource
         {
             throw new NotImplementedException();
diff --git a/API/Sources/Helpers/UnitHelper.cs b/API/Sources/Helpers/UnitHelper.cs
@@ -13,7 +13,7 @@ public sealed class UnitHelper : ActorHelper<IUnit>
         /// <inheritdoc cref="GetMyUnits{TUnit}"/>
         /// <typeparam name="TUnit">Type of the Unit to be searched for.</typeparam>
         /// <returns>List of Units</returns>
-        public static IList<TUnit> GetMyUnitsAsList<TUnit>() where TUnit : IUnit
+        public static List<TUnit> GetMyUnitsAsList<TUnit>() where TUnit : IUnit
         {
             throw new NotImplementedException();
         }
@@ -31,7 +31,7 @@ public static TUnit[] GetMyUnits<TUnit>() where TUnit : IUnit
         /// <inheritdoc cref="GetVisibleEnemyUnits{TUnit}"/>
         /// <typeparam name="TUnit">Type of the Unit to be searched for.</typeparam>
         /// <returns>List of Units</returns>
-        public static IList<TUnit> GetVisibleEnemyUnitsAsList<TUnit>() where TUnit : IUnit
+        public static List<TUnit> GetVisibleEnemyUnitsAsList<TUnit>() where TUnit : IUnit
         {
             throw new NotImplementedException();
         }
diff --git a/Assets/Game/Meshes/Actors/Units/Goblin/Animators/GoblinAnimator.controller b/Assets/Game/Meshes/Actors/Units/Goblin/Animators/GoblinAnimator.controller
@@ -13,7 +13,7 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -226,7 +226,7 @@ AnimatorState:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Build
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 1101000011271170944}
@@ -250,7 +250,7 @@ AnimatorState:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Move
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 1101000011872441762}
@@ -274,7 +274,7 @@ AnimatorState:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Gather
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 1101000012103646210}
@@ -298,7 +298,7 @@ AnimatorState:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Attack
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 1101000013839435532}
@@ -322,7 +322,7 @@ AnimatorState:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Idle
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 1101000011031516282}
diff --git a/Assets/Game/Prefabs/Actors/Units/DonkeyGun.prefab b/Assets/Game/Prefabs/Actors/Units/DonkeyGun.prefab
@@ -264,8 +264,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 907c1687b5023ca4a8ae5376bcb0dbbc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speed: 6
-  rotateSpeed: 5
+  speed: 12
+  rotateSpeed: 8
   target: {x: 0, y: 0, z: 0}
   gridI: 0
   myPath:
diff --git a/Assets/Game/Prefabs/Actors/Units/Goblin.prefab b/Assets/Game/Prefabs/Actors/Units/Goblin.prefab
@@ -2850,8 +2850,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 907c1687b5023ca4a8ae5376bcb0dbbc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speed: 5
-  rotateSpeed: 8
+  speed: 10
+  rotateSpeed: 10
   target: {x: 0, y: 0, z: 0}
   gridI: 0
   myPath:
diff --git a/Assets/Game/Prefabs/Managers/Player Manager.prefab b/Assets/Game/Prefabs/Managers/Player Manager.prefab
@@ -244,7 +244,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   key: q
-  modifier: 4
+  NormalSpeed: 1
+  Modifier: 5
 --- !u!114 &114000012604824786
 MonoBehaviour:
   m_ObjectHideFlags: 1
diff --git a/Assets/Game/Scenes/BasicScene.unity b/Assets/Game/Scenes/BasicScene.unity
@@ -601,7 +601,6 @@ MonoBehaviour:
   Resources: []
   EnemyVisibleUnits: []
   EnemyVisibleBuildings: []
-  Minerals: 80
 --- !u!1 &1355207518
 GameObject:
   m_ObjectHideFlags: 0
@@ -928,7 +927,6 @@ MonoBehaviour:
   Resources: []
   EnemyVisibleUnits: []
   EnemyVisibleBuildings: []
-  Minerals: 80
 --- !u!1001 &1641735590
 Prefab:
   m_ObjectHideFlags: 0
@@ -1347,7 +1345,6 @@ MonoBehaviour:
   Resources: []
   EnemyVisibleUnits: []
   EnemyVisibleBuildings: []
-  Minerals: 80
 --- !u!1 &1808043854
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Game/Scripts/Core/Faction/Units/UnitController.cs b/Assets/Game/Scripts/Core/Faction/Units/UnitController.cs
@@ -47,7 +47,7 @@ public class UnitController : MonoBehaviour
         public Vector3 targetPoint;
         public int size = 1;
         Health healthObj;
-        internal UnitActionQueue.UnitActionDequeue _actionDequeue { get; set; }
+        internal UnitActionQueue.ActionDequeue _actionDequeue { get; set; }
 
         protected Faction Faction
         {
@@ -341,12 +341,22 @@ void FixedUpdate()
                             target.transform.position.x,
                             transform.position.y,
                             target.transform.position.z));
-                        resource.DropOff(this);
-                        var args = new Arguments
+                        if (resource.target != null)
                         {
-                            MyUnit = UnitActor
-                        };
-                        GameManager.Instance.FiredEvent(PlayerOwner, GameEventType.MineralsChanged, args);
+                            resource.DropOff(this);
+                            GameManager.Instance.FiredEvent(
+                                PlayerOwner,
+                                GameEventType.MineralsChanged,
+                                new Arguments
+                                {
+                                    MyUnit = UnitActor
+                                });
+                        }
+                        else
+                        {
+                            ResetTarget();
+                            ProcessActionQueue();
+                        }
                     }
                     else if (anim.state != "Move")
                     {
diff --git a/Assets/Game/Scripts/Core/Resources/ResourceSource.cs b/Assets/Game/Scripts/Core/Resources/ResourceSource.cs
@@ -1,5 +1,6 @@
 using UnityEngine;
 using XposeCraft.Core.Grids;
+using XposeCraft.GameInternal;
 
 namespace XposeCraft.Core.Resources
 {
@@ -24,10 +25,23 @@ public int RequestResource(int rAmount)
                 amount = amount - rAmount;
                 return rAmount;
             }
-
             amount = 0;
+            if (!deleteWhenExhausted)
+            {
+                return amount;
+            }
             OpenPoints();
             Destroy(gameObject);
+            var sharedResources = GameManager.Instance.Players[0].Resources;
+            for (var playerResoureIndex = 0; playerResoureIndex < sharedResources.Count; playerResoureIndex++)
+            {
+                if (GameManager.Instance.ActorLookup[gameObject].Equals(sharedResources[playerResoureIndex]))
+                {
+                    sharedResources.RemoveAt(playerResoureIndex);
+                    return amount;
+                }
+            }
+            Log.w("Resource " + gameObject.name + " did not have Actor representation but was removed");
             return amount;
         }
 
diff --git a/Assets/Game/Scripts/Game/Actors/Resources/Resource.cs b/Assets/Game/Scripts/Game/Actors/Resources/Resource.cs
@@ -12,9 +12,13 @@ public abstract class Resource : Actor, IResource
         /// <summary>
         /// Internal method, do not use.
         /// </summary>
-        internal void GatherByWorker(List<UnitController> builderUnits)
+        internal void GatherByWorker(List<UnitController> gatheringUnits)
         {
-            UnitSelection.SetTarget(builderUnits, GameObject, GameObject.transform.position);
+            if (GameObject == null)
+            {
+                throw new ResourceExhaustedException(this);
+            }
+            UnitSelection.SetTarget(gatheringUnits, GameObject, GameObject.transform.position);
         }
 
         internal static T CreateResourceActor<T>(GameObject gameObject) where T : Resource
diff --git a/Assets/Game/Scripts/Game/Actors/Resources/ResourceExhaustedException.cs b/Assets/Game/Scripts/Game/Actors/Resources/ResourceExhaustedException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace XposeCraft.Game.Actors.Resources
+{
+    public class ResourceExhaustedException : Exception
+    {
+        public ResourceExhaustedException() : base("Resource is not available for gathering anymore")
+        {
+        }
+
+        public ResourceExhaustedException(IResource resource) : base(
+            "Resource " + resource.GetType().Name + " is not available for gathering anymore")
+        {
+        }
+
+        public ResourceExhaustedException(string message) : base(message)
+        {
+        }
+    }
+}
diff --git a/Assets/Game/Scripts/Game/Actors/Resources/ResourceExhaustedException.cs.meta b/Assets/Game/Scripts/Game/Actors/Resources/ResourceExhaustedException.cs.meta
diff --git a/Assets/Game/Scripts/Game/Actors/Units/Unit.cs b/Assets/Game/Scripts/Game/Actors/Units/Unit.cs
@@ -27,7 +27,7 @@ public UnitActionQueue ActionQueue
                 // TODO: clone before creating a representing dequeue
                 _actionQueue = value;
                 UnitController._actionDequeue =
-                    new UnitActionQueue.UnitActionDequeue(this, UnitController, _actionQueue);
+                    new UnitActionQueue.ActionDequeue(this, UnitController, _actionQueue);
                 UnitController._actionDequeue.Dequeue();
             }
         }
diff --git a/Assets/Game/Scripts/Game/Actors/Units/Worker.cs b/Assets/Game/Scripts/Game/Actors/Units/Worker.cs
@@ -28,13 +28,13 @@ public class Worker : Unit
         /// <see cref="XposeCraft.Game.Helpers.ResourceHelper"/> provides various methods to find some.
         /// </summary>
         /// <param name="resource">Resource to be gathered.</param>
-        public void SendGather(IResource resource)
+        public UnitActionQueue SendGather(IResource resource)
         {
             if (resource != null)
             {
                 Tutorial.Instance.SendGather();
             }
-            ActionQueue = new UnitActionQueue(new GatherResource(resource));
+            return ActionQueue = new UnitActionQueue(new GatherResource(resource));
         }
 
         // TODO:
diff --git a/Assets/Game/Scripts/Game/Control/GameActions/GatherResource.cs b/Assets/Game/Scripts/Game/Control/GameActions/GatherResource.cs
diff --git a/Assets/Game/Scripts/Game/Control/UnitActionQueue.cs b/Assets/Game/Scripts/Game/Control/UnitActionQueue.cs
diff --git a/Assets/Game/Scripts/Game/Helpers/BuildingHelper.cs b/Assets/Game/Scripts/Game/Helpers/BuildingHelper.cs
diff --git a/Assets/Game/Scripts/Game/Helpers/ResourceHelper.cs b/Assets/Game/Scripts/Game/Helpers/ResourceHelper.cs
diff --git a/Assets/Game/Scripts/Game/Helpers/UnitHelper.cs b/Assets/Game/Scripts/Game/Helpers/UnitHelper.cs
diff --git a/Assets/Game/Scripts/GameInternal/GameManager.cs b/Assets/Game/Scripts/GameInternal/GameManager.cs
diff --git a/Assets/Game/Scripts/GameInternal/Player.cs b/Assets/Game/Scripts/GameInternal/Player.cs

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public sealed class BuildingHelper : ActorHelper<IBuilding>`
`14`	`14`	`/// <inheritdoc cref="GetMyBuildings{TBuilding}"/>`
`15`	`15`	`/// <typeparam name="TBuilding">Type of the Building to be searched for.</typeparam>`
`16`	`16`	`/// <returns>List of Buildings.</returns>`
`17`		`- public static IList<TBuilding> GetMyBuildingsAsList<TBuilding>() where TBuilding : IBuilding`
	`17`	`+ public static List<TBuilding> GetMyBuildingsAsList<TBuilding>() where TBuilding : IBuilding`
`18`	`18`	`{`
`19`	`19`	`throw new NotImplementedException();`
`20`	`20`	`}`
`@@ -32,7 +32,7 @@ public static TBuilding[] GetMyBuildings<TBuilding>() where TBuilding : IBuildin`
`32`	`32`	`/// <inheritdoc cref="GetVisibleEnemyBuildings{TUnit}"/>`
`33`	`33`	`/// <typeparam name="TBuilding">Type of the Buildings to be searched for.</typeparam>`
`34`	`34`	`/// <returns>List of Buildings</returns>`
`35`		`- public static IList<TBuilding> GetVisibleEnemyBuildingsAsList<TBuilding>() where TBuilding : IBuilding`
	`35`	`+ public static List<TBuilding> GetVisibleEnemyBuildingsAsList<TBuilding>() where TBuilding : IBuilding`
`36`	`36`	`{`
`37`	`37`	`throw new NotImplementedException();`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public sealed class ResourceHelper : ActorHelper<IResource>`
`17`	`17`	`/// <inheritdoc cref="GetResources{TResource}"/>`
`18`	`18`	`/// <typeparam name="TResource">Type of the Resource to be searched for.</typeparam>`
`19`	`19`	`/// <returns>List of resources.</returns>`
`20`		`- public static IList<TResource> GetResourcesAsList<TResource>() where TResource : IResource`
	`20`	`+ public static List<TResource> GetResourcesAsList<TResource>() where TResource : IResource`
`21`	`21`	`{`
`22`	`22`	`throw new NotImplementedException();`
`23`	`23`	`}`
`@@ -60,7 +60,7 @@ public static TResource GetNearestResourceTo<TResource>(IActor actor) where TRes`
`60`	`60`	`/// <param name="baseCenter">Base near which all nearest resources will be looked for.</param>`
`61`	`61`	`/// <typeparam name="TResource">Type of the Resource to be searched for.</typeparam>`
`62`	`62`	`/// <returns>List of resources.</returns>`
`63`		`- public static IList<TResource> GetResourcesNearBase<TResource>(BaseCenter baseCenter)`
	`63`	`+ public static List<TResource> GetResourcesNearBase<TResource>(BaseCenter baseCenter)`
`64`	`64`	`where TResource : IResource`
`65`	`65`	`{`
`66`	`66`	`throw new NotImplementedException();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public sealed class UnitHelper : ActorHelper<IUnit>`
`13`	`13`	`/// <inheritdoc cref="GetMyUnits{TUnit}"/>`
`14`	`14`	`/// <typeparam name="TUnit">Type of the Unit to be searched for.</typeparam>`
`15`	`15`	`/// <returns>List of Units</returns>`
`16`		`- public static IList<TUnit> GetMyUnitsAsList<TUnit>() where TUnit : IUnit`
	`16`	`+ public static List<TUnit> GetMyUnitsAsList<TUnit>() where TUnit : IUnit`
`17`	`17`	`{`
`18`	`18`	`throw new NotImplementedException();`
`19`	`19`	`}`
`@@ -31,7 +31,7 @@ public static TUnit[] GetMyUnits<TUnit>() where TUnit : IUnit`
`31`	`31`	`/// <inheritdoc cref="GetVisibleEnemyUnits{TUnit}"/>`
`32`	`32`	`/// <typeparam name="TUnit">Type of the Unit to be searched for.</typeparam>`
`33`	`33`	`/// <returns>List of Units</returns>`
`34`		`- public static IList<TUnit> GetVisibleEnemyUnitsAsList<TUnit>() where TUnit : IUnit`
	`34`	`+ public static List<TUnit> GetVisibleEnemyUnitsAsList<TUnit>() where TUnit : IUnit`
`35`	`35`	`{`
`36`	`36`	`throw new NotImplementedException();`
`37`	`37`	`}`