Changeset 312 for binary-improvements/7dtd-server-fixes

Timestamp:

Jan 18, 2018, 4:56:02 PM (7 years ago)

Author:

alloc

Message:

Common func: Rebased Animals and Hostiles to common base

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (1 diff)
• ModInfo.xml (modified) (1 diff)
• src/LiveData/Animals.cs (modified) (1 diff)
• src/LiveData/EntityFilterList.cs (added)
• src/LiveData/Hostiles.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -93 +93 @@
     <Compile Include="src\PersistentData\Attributes.cs" />
     <Compile Include="src\JSON\JSONValue.cs" />
+    <Compile Include="src\LiveData\EntityFilterList.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/7dtd-server-fixes/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Common functions" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="16" />
+                <Version value="17" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/7dtd-server-fixes/src/LiveData/Animals.cs

@@ -4 +4 @@
 namespace AllocsFixes.LiveData
 {
-    public class Animals
+        public class Animals : EntityFilterList<EntityAnimal>
     {
-                public static void Get (List<EntityAnimal> _list) {
-                        _list.Clear ();
-                        try {
-                                List<Entity> entities = GameManager.Instance.World.Entities.list;
-                                for (int i = 0; i < entities.Count; i++) {
-                                        Entity entity = entities [i];
 
-                                        if (entity is EntityAnimal) {
-                                                EntityAnimal ea = (EntityAnimal)entity;
+                public static readonly Animals Instance = new Animals ();
 
-                                                if (ea.IsAlive ())
-                                                        _list.Add (ea);
-                                        }
+                protected override EntityAnimal predicate (Entity _e) {
+                        if (_e is EntityAnimal) {
+                                EntityAnimal ea = (EntityAnimal)_e;
+
+                                if (ea.IsAlive ()) {
+                                        return ea;
                                 }
                         }
-                        catch (Exception e) {
-                                Log.Exception (e);
-                        }
-                }
-
-                public static int GetCount () {
-                        int count = 0;
-                        try {
-                                List<Entity> entities = GameManager.Instance.World.Entities.list;
-                                for (int i = 0; i < entities.Count; i++) {
-                                        Entity entity = entities [i];
-
-                                        if (entity is EntityAnimal) {
-                                                EntityAnimal ea = (EntityAnimal)entity;
-
-                                                if (ea.IsAlive ())
-                                                        count++;
-                                        }
-                                }
-                        }
-                        catch (Exception e) {
-                                Log.Exception (e);
-                        }
-                        return count;
+                        return null;
                 }
 

binary-improvements/7dtd-server-fixes/src/LiveData/Hostiles.cs

@@ -4 +4 @@
 namespace AllocsFixes.LiveData
 {
-        public class Hostiles
+        public class Hostiles : EntityFilterList<EntityEnemy>
         {
-                public static void Get (List<EntityEnemy> _list) {
-                        _list.Clear ();
-                        try {
-                                List<Entity> entities = GameManager.Instance.World.Entities.list;
-                                for (int i = 0; i < entities.Count; i++) {
-                                        Entity entity = entities [i];
 
-                                        if (entity is EntityEnemy) {
-                                                if (entity.IsAlive ())
-                                                        _list.Add (entity as EntityEnemy);
-                                        }
+                public static readonly Hostiles Instance = new Hostiles ();
+
+                override protected EntityEnemy predicate (Entity _e) {
+                        if (_e is EntityEnemy) {
+                                if (_e.IsAlive ()) {
+                                        return _e as EntityEnemy;
                                 }
                         }
-                        catch (Exception e) {
-                                Log.Exception (e);
-                        }
+                        return null;
                 }
 
-                public static int GetCount () {
-                        int count = 0;
-                        try {
-                                List<Entity> entities = GameManager.Instance.World.Entities.list;
-                                for (int i = 0; i < entities.Count; i++) {
-                                        Entity entity = entities [i];
-
-                                        if (entity.entityType == EntityType.Zombie) {
-                                                EntityEnemy ee = (EntityEnemy)entity;
-
-                                                if (ee.IsAlive ())
-                                                        count++;
-                                        }
-                                }
-                        }
-                        catch (Exception e) {
-                                Log.Exception (e);
-                        }
-                        return count;
-                }
         }
 }