Merge pull request #33 from Allen-Wrench/master

Fix for refineries getting concealed after server restart, added option in settings to disable rc keepalive action.

Author: Bishbash777

Concealment/Concealment.csproj

@@ -7,8 +7,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Concealment</RootNamespace>
     <AssemblyName>Concealment</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>

Concealment/ConcealmentControl.xaml

@@ -19,6 +19,7 @@
                 <CheckBox Content="Enable Concealment" Margin="3" IsChecked="{Binding Enabled}" />
                 <CheckBox Content="Conceal Production" ToolTip="Conceal grids with active production blocks." Margin="3" IsChecked="{Binding ConcealProduction}" />
                 <CheckBox Content="Conceal Pirates" ToolTip="Conceal grids owned by Space Pirates." Margin="3" IsChecked="{Binding ConcealPirates}" />
+                <CheckBox Content="RC Keep Alive Action" ToolTip="Adds a toolbar action to remote control blocks to allow players to forcefully keep a grid from being concealed using a PB or Timer." Margin="3" IsChecked="{Binding RCKeepAliveAction}" />
                 <StackPanel Orientation="Horizontal">
                     <TextBox Margin="3" Width="150" Text="{Binding ConcealDistance}" />
                     <Label Content="Conceal Distance (meters)" Margin="3" />

Concealment/ConcealmentPlugin.cs

@@ -11,6 +11,7 @@
 using Sandbox.Definitions;
 using Sandbox.Engine.Multiplayer;
 using Sandbox.Game.Entities;
+using Sandbox.Game.Entities.Cube;
 using Sandbox.Game.EntityComponents;
 using Sandbox.Game.Multiplayer;
 using Sandbox.Game.World;
@@ -108,16 +109,19 @@ public override void Update()
             var delayTimer = new System.Timers.Timer
             {
                 AutoReset = false,
-                Interval = 5000,
+                Interval = 30000,
             };
 
             delayTimer.Elapsed += (sender, args) => _ready = true;
             delayTimer.Start();
-
-            var keepAliveAction = MyAPIGateway.TerminalControls.CreateAction<IMyRemoteControl>("Concealment.KeepAlive");
-            keepAliveAction.Action = KeepAlive;
-            MyAPIGateway.TerminalControls.AddAction<IMyRemoteControl>(keepAliveAction);
-
+            
+            if (Settings.Data.RCKeepAliveAction)
+            {
+                var keepAliveAction = MyAPIGateway.TerminalControls.CreateAction<IMyRemoteControl>("Concealment.KeepAlive");
+                keepAliveAction.Action = KeepAlive;
+                MyAPIGateway.TerminalControls.AddAction<IMyRemoteControl>(keepAliveAction);
+            }
+            
             MyMultiplayer.Static.ClientJoined += RevealCryoPod;
 
             _init = true;
@@ -367,14 +371,21 @@ public bool IsExcluded(ConcealGroup group)
                     if (block == null)
                         continue;
 
-                    if (block is IMyProductionBlock p && !Settings.Data.ConcealProduction && p.IsProducing)
-                    {
-                        Log.Debug($"{group.GridNames} exempted production ({p.CustomName} active)");
-                        exclude = true;
-                        break;
-                    }
-
-                    if (Settings.Data.ExcludedSubtypes.Contains(block.BlockDefinition.Id.SubtypeName))
+					if (block is MyRefinery r && !Settings.Data.ConcealProduction && !r.InputInventory.Empty() && r.IsFunctional && r.Enabled)
+					{
+						Log.Debug($"{group.GridNames} exempted refinery ({r.CustomName} active)");
+						exclude = true;
+						break;
+					}
+
+					if (block is MyProductionBlock p && !Settings.Data.ConcealProduction && p.IsProducing)
+					{
+						Log.Debug($"{group.GridNames} exempted production ({p.CustomName} active)");
+						exclude = true;
+						break;
+					}
+
+					if (Settings.Data.ExcludedSubtypes.Contains(block.BlockDefinition.Id.SubtypeName))
                     {
                         Log.Debug($"{group.GridNames} exempted subtype {block.BlockDefinition.Id.SubtypeName}");
                         exclude = true;

Concealment/Settings.cs

@@ -23,8 +23,10 @@ public class Settings : ViewModel
         private int _revealInterval = 60;
         private bool _concealProduction;
         private bool _concealPirates;
+        private bool _keepAliveAction;
 
-        private double _dynamicConcealQueryInterval = 15;
+
+		private double _dynamicConcealQueryInterval = 15;
         private double _dynamicConcealScanInterval = 2;
 
         /// <summary>
@@ -252,5 +254,15 @@ public bool ConcealPirates
                 OnPropertyChanged();
             }
         }
-    }
+
+		public bool RCKeepAliveAction
+		{
+			get => _keepAliveAction;
+			set
+			{
+				_keepAliveAction = value;
+				OnPropertyChanged();
+			}
+		}
+	}
 }