Merge branch 'master' of https://github.com/TorchSE/Essentials into master

Author: Jimmacle

Essentials.Tests/Essentials.Tests.csproj

@@ -90,4 +90,4 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

Essentials/Commands/AdminModule.cs

@@ -298,5 +298,36 @@ public void ListMute()
             var ms = new DialogMessage("Muted Users", content: sb.ToString());
             ModCommunication.SendMessageTo(ms, Context.Player.SteamUserId);
         }
+
+        [Command("give", "Insert an item with a specific quanity into a players inventory")]
+        [Permission(MyPromoteLevel.Admin)]
+        public void give(string playerName, string itemType, string item, int quantity) {
+            string type = "MyObjectBuilder_" + itemType;
+            VRage.Game.MyDefinitionId.TryParse(type, item, out VRage.Game.MyDefinitionId defID);
+
+            if (defID.ToString().Contains("null")) {
+                Context.Respond("Invalid item type");
+                return;
+            }
+
+            if (playerName != "*") {
+                var p = Utilities.GetPlayerByNameOrId(playerName);
+                if (p == null) {
+                    Context.Respond("Player not found");
+                    return;
+                }
+                Sandbox.Game.MyVisualScriptLogicProvider.AddToPlayersInventory(p.IdentityId, defID, quantity);
+                ModCommunication.SendMessageTo(new NotificationMessage($"You have been given {quantity} {item} {itemType}", 5000, "Blue"), p.SteamUserId);
+            }
+
+            else {
+                foreach (var p in MySession.Static.Players.GetOnlinePlayers()) {
+                    var player = Utilities.GetPlayerByNameOrId(p.DisplayName);
+                    Sandbox.Game.MyVisualScriptLogicProvider.AddToPlayersInventory(p.Identity.IdentityId, defID, quantity);
+                    ModCommunication.SendMessageTo(new NotificationMessage($"You have been given {quantity} {item} {itemType}", 5000, "Blue"), player.SteamUserId);
+                }
+            }
+            Context.Respond("Item(s) given!");
+        }
     }
 }

Essentials/Commands/BlocksModule.cs

@@ -65,8 +65,7 @@ public void OffType(string type)
                 foreach (var block in grid.GetFatBlocks().OfType<MyFunctionalBlock>())
                 {
                     var blockType = block.BlockDefinition.Id.TypeId.ToString().Substring(16);
-                    if (block != null && string.Compare(type, blockType, StringComparison.InvariantCultureIgnoreCase) ==
-                        0)
+                    if (block != null && string.Compare(type, blockType, StringComparison.InvariantCultureIgnoreCase) == 0 && block.Enabled == true)
                     {
                         block.Enabled = false;
                         count++;

Essentials/Commands/CleanupModule.cs

@@ -1,22 +1,16 @@
-using System;
+using NLog;
+using Sandbox.Game.Entities;
+using Sandbox.Game.EntityComponents;
+using Sandbox.Game.World;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Media.Media3D;
-using Sandbox.Game.Entities;
-using Sandbox.Game.World;
 using Torch.Commands;
-using NLog;
-using Sandbox.Game.EntityComponents;
-using Sandbox.Game.Multiplayer;
-using SpaceEngineers.Game.Entities.Blocks;
 using Torch.Mod;
 using Torch.Mod.Messages;
-using VRage.Game.Entity;
-using VRage.Game.ModAPI;
 using Vector3D = VRageMath.Vector3D;
 
 namespace Essentials.Commands
@@ -25,6 +19,7 @@ namespace Essentials.Commands
     public class CleanupModule : CommandModule
     {
         private static readonly Logger Log = LogManager.GetLogger("Essentials");
+
         [Command("scan", "Find grids matching the given conditions")]
         public void Scan()
         {
@@ -64,7 +59,7 @@ public void Delete()
             Log.Info($"Cleanup deleted {count} grids matching conditions {string.Join(", ", Context.Args)}");
         }
 
-        [Command("delete floatingobjects","deletes floating objects")]
+        [Command("delete floatingobjects", "deletes floating objects")]
         public void FlObjDelete()
         {
             var count = 0;
@@ -76,7 +71,6 @@ public void FlObjDelete()
             }
             Context.Respond($"Deleted {count} floating objects.");
             Log.Info($"Cleanup deleted {count} floating objects");
-
         }
 
         [Command("help", "Lists all cleanup conditions.")]
@@ -89,8 +83,8 @@ public void Help()
                 sb.AppendLine($"   {c.HelpText}");
             }
 
-            if(!Context.SentBySelf)
-            ModCommunication.SendMessageTo(new DialogMessage("Cleanup help", null, sb.ToString()), Context.Player.SteamUserId);
+            if (!Context.SentBySelf)
+                ModCommunication.SendMessageTo(new DialogMessage("Cleanup help", null, sb.ToString()), Context.Player.SteamUserId);
             else
                 Context.Respond(sb.ToString());
         }
@@ -116,8 +110,8 @@ public CleanupModule()
         private IEnumerable<MyCubeGrid> ScanConditions(IReadOnlyList<string> args)
         {
             var conditions = new List<Func<MyCubeGrid, bool?>>();
-            
-            for (var i = 0; i < args.Count; i ++)
+
+            for (var i = 0; i < args.Count; i++)
             {
                 string parameter;
                 if (i + 1 >= args.Count)
@@ -130,7 +124,6 @@ private IEnumerable<MyCubeGrid> ScanConditions(IReadOnlyList<string> args)
                 }
 
                 var arg = args[i];
-                
 
                 if (parameter != null)
                 {
@@ -169,7 +162,7 @@ private IEnumerable<MyCubeGrid> ScanConditions(IReadOnlyList<string> args)
             }
 
             //default scan to find grids without pilots
-            if(!args.Contains("haspilot", StringComparer.CurrentCultureIgnoreCase))
+            if (!args.Contains("haspilot", StringComparer.CurrentCultureIgnoreCase))
                 conditions.Add(g => !Piloted(g));
 
             foreach (var group in MyCubeGridGroups.Static.Logical.Groups)
@@ -180,7 +173,7 @@ private IEnumerable<MyCubeGrid> ScanConditions(IReadOnlyList<string> args)
                 {
                     if (node.NodeData.Projector != null)
                         continue;
-                    
+
                     foreach (var c in conditions)
                     {
                         bool? r = c.Invoke(node.NodeData);
@@ -196,7 +189,7 @@ private IEnumerable<MyCubeGrid> ScanConditions(IReadOnlyList<string> args)
                         break;
                 }
 
-                if(res)
+                if (res)
                     foreach (var grid in group.Nodes.Where(x => x.NodeData.Projector == null))
                         yield return grid.NodeData;
             }
@@ -218,6 +211,49 @@ public bool BlocksLessThan(MyCubeGrid grid, int count)
             return grid.BlocksCount < count;
         }
 
+        [Condition("pcugreaterthan", helpText: "Finds grids with more than the given number of PCU.")]
+        public bool PCUGreaterThan(MyCubeGrid grid, int pcu)
+        {
+            return grid.BlocksPCU > pcu;
+        }
+
+        [Condition("pculessthan", helpText: "Finds grids with less than the given number of PCU.")]
+        public bool PCULessThan(MyCubeGrid grid, int pcu)
+        {
+            return grid.BlocksPCU < pcu;
+        }
+
+        [Condition("hasownertype", helpText: "Finds grids with the specified owner type (npc | player | nobody).")]
+        public bool HasOwnerType(MyCubeGrid grid, string ownerType)
+        {
+            if (string.IsNullOrEmpty(ownerType))
+                return false;
+
+            // Get the owner type of the grid.
+            var gridOwnerType = Utils.Ownership.GetOwnerType(grid);
+
+            // Check provided input string.
+            switch (ownerType.ToLower().Trim())
+            {
+                // Check if grid is owner by an NPC.
+                case "npc":
+                case "npcs":
+                    return gridOwnerType == Utils.Ownership.OwnerType.NPC;
+
+                // Check if the grid is owned by a Player.
+                case "player":
+                case "players":
+                    return gridOwnerType == Utils.Ownership.OwnerType.Player;
+
+                // Check if the grid is owned by Nobody.
+                case "nobody":
+                    return gridOwnerType == Utils.Ownership.OwnerType.Nobody;
+            }
+
+            // In all other cases, just return false.
+            return false;
+        }
+
         [Condition("blocksgreaterthan", helpText: "Finds grids with more than the given number of blocks.")]
         public bool BlocksGreaterThan(MyCubeGrid grid, int count)
         {
@@ -290,18 +326,25 @@ public bool OwnedBy(MyCubeGrid grid, string str)
                 return grid.BigOwners.Count == 0;
             }
 
+            if (string.Compare(str, "npc", StringComparison.Ordinal) == 0)
+            {
+                return grid.BigOwners.Count > 0 &&
+                       MySession.Static.Factions.IsNpcFaction(grid.BigOwners.FirstOrDefault());
+            }
+            
+
             if (string.Compare(str, "pirates", StringComparison.InvariantCultureIgnoreCase) == 0)
             {
                 identityId = MyPirateAntennas.GetPiratesId();
             }
             else
             {
-                var player = Utilities.GetPlayerByNameOrId(str);
+                var player = Utilities.GetIdentityByNameOrIds(str);
                 if (player == null)
                 {
-                    if(long.TryParse(str, out long NPCId))
+                    if (long.TryParse(str, out long NPCId))
                     {
-                        if(MySession.Static.Players.IdentityIsNpc(NPCId))
+                        if (MySession.Static.Players.IdentityIsNpc(NPCId))
                         {
                             return grid.BigOwners.Contains(NPCId);
                         }
@@ -313,6 +356,7 @@ public bool OwnedBy(MyCubeGrid grid, string str)
 
             return grid.BigOwners.Contains(identityId);
         }
+        
 
         [Condition("hastype", "notype", "Finds grids containing blocks of the given type.")]
         public bool BlockType(MyCubeGrid grid, string str)
@@ -329,11 +373,11 @@ public bool BlockSubType(MyCubeGrid grid, string str)
         [Condition("haspilot", "Finds grids with pilots")]
         public bool Piloted(MyCubeGrid grid)
         {
-            return grid.GetFatBlocks().OfType<MyCockpit>().Any(b => b.Pilot != null);
+            return grid.GetFatBlocks().OfType<MyShipController>().Any(b => b.Pilot != null);
         }
 
         /// <summary>
-        /// Removes pilots from grid before deleting, 
+        /// Removes pilots from grid before deleting,
         /// so the character doesn't also get deleted and break everything
         /// </summary>
         /// <param name="grid"></param>
@@ -360,7 +404,7 @@ public Condition(MethodInfo evalMethod, ConditionAttribute attribute)
                 InvertCommand = attribute.InvertCommand;
                 HelpText = attribute.HelpText;
                 _method = evalMethod;
-                if(_method.ReturnType!= typeof(bool))
+                if (_method.ReturnType != typeof(bool))
                     throw new TypeLoadException("Condition does not return a bool!");
                 var p = _method.GetParameters();
                 if (p.Length < 1 || p[0].ParameterType != typeof(MyCubeGrid))
@@ -371,7 +415,6 @@ public Condition(MethodInfo evalMethod, ConditionAttribute attribute)
                     Parameter = null;
                 else
                     Parameter = p[1];
-
             }
 
             public bool? Evaluate(MyCubeGrid grid, string arg, bool invert, CleanupModule module)
@@ -396,13 +439,13 @@ public Condition(MethodInfo evalMethod, ConditionAttribute attribute)
                         return null;
                     }
 
-                    result = (bool)_method.Invoke(module, new[] {grid, val});
+                    result = (bool)_method.Invoke(module, new[] { grid, val });
                 }
                 else
                 {
-                    result = (bool)_method.Invoke(module, new object[] {grid});
+                    result = (bool)_method.Invoke(module, new object[] { grid });
                 }
-                
+
                 return result != invert;
             }
         }