p34.6 hotfix (#510)

Author: Sellafield

src/Perpetuum/Services/Channels/ChatCommands/AdminCommandHandlers.cs

@@ -72,6 +72,7 @@ private static void ZoneSetTilesControl(AdminCommandData data, TerrainControlFla
             }
             SendMessageToAll(data, string.Format("Altered state of control layer on {0} Tiles ({1}: set to {2})", lockedtiles.Count, flag, adddelete));
         }
+
         private static void LockOrUnlockZoneLayers(AdminCommandData data, bool toLock)
         {
             if (!IsDevModeEnabled(data))
@@ -102,6 +103,39 @@ private static void LockOrUnlockZoneLayers(AdminCommandData data, bool toLock)
             zone.IsLayerEditLocked = toLock;
             SendMessageToAll(data, $"All layers on zone {zoneId} {(toLock ? "LOCKED" : "UNLOCKED")}!");
         }
+
+        private static void SwitchZoneDegrade(AdminCommandData data, bool state)
+        {
+            if (!IsDevModeEnabled(data))
+            {
+                return;
+            }
+
+            bool err = false;
+            int zoneId = -1;
+            if (data.Command.Args.IsNullOrEmpty())
+            {
+                Character character = data.Request.Session.Character;
+                zoneId = character.ZoneId ?? -1;
+            }
+            else if (data.Command.Args.Length >= 1)
+            {
+                err = !int.TryParse(data.Command.Args[0], out int id);
+                zoneId = id;
+            }
+
+            if (err)
+            {
+                SendMessageToAll(data, "Error parsing args");
+                throw PerpetuumException.Create(ErrorCodes.RequiredArgumentIsNotSpecified);
+            }
+
+            CheckZoneId(data, zoneId);
+            IZone zone = data.Request.Session.ZoneMgr.GetZone(zoneId);
+            zone.TerraformHandler.Degrade = state;
+            SendMessageToAll(data, $"Zone {zoneId} degrade {(state ? "ENABLED" : "DISABLED")}!");
+        }
+
         public static void CheckZoneId(AdminCommandData data, int zoneId)
         {
             if (!data.Request.Session.ZoneMgr.ContainsZone(zoneId))
@@ -1507,11 +1541,25 @@ public static void ZoneLockLayers(AdminCommandData data)
         {
             LockOrUnlockZoneLayers(data, true);
         }
+
         [ChatCommand("ZoneUnlockLayers")]
         public static void ZoneUnlockLayers(AdminCommandData data)
         {
             LockOrUnlockZoneLayers(data, false);
         }
+
+        [ChatCommand("ZoneDisableDegrade")]
+        public static void ZoneDisableDegrade(AdminCommandData data)
+        {
+            SwitchZoneDegrade(data, false);
+        }
+
+        [ChatCommand("ZoneEnableDegrade")]
+        public static void ZoneEnableDegrade(AdminCommandData data)
+        {
+            SwitchZoneDegrade(data, true);
+        }
+
         [ChatCommand("TestMissions")]
         public static void TestMissions(AdminCommandData data)
         {

src/Perpetuum/Zones/FieldEffectGenerators/FieldEccmEffectGenerator.cs

@@ -57,6 +57,7 @@ private int EmitRadius
         public void SetDespawnTime(TimeSpan despawnTime)
         {
             _despawnHelper = UnitDespawnHelper.Create(this, despawnTime);
+            _despawnHelper.DespawnStrategy = Kill;
         }
 
         public void ApplyFieldEffect()

src/Perpetuum/Zones/FieldEffectGenerators/FieldReactorStabilizerEffectGenerator.cs

@@ -58,6 +58,7 @@ private int EmitRadius
         public void SetDespawnTime(TimeSpan despawnTime)
         {
             _despawnHelper = UnitDespawnHelper.Create(this, despawnTime);
+            _despawnHelper.DespawnStrategy = Kill;
         }
 
         public void ApplyFieldEffect()

src/Perpetuum/Zones/FieldEffectGenerators/FieldStealthEffectGenerator.cs

@@ -54,6 +54,7 @@ private int EmitRadius
         public void SetDespawnTime(TimeSpan despawnTime)
         {
             _despawnHelper = UnitDespawnHelper.Create(this, despawnTime);
+            _despawnHelper.DespawnStrategy = Kill;
         }
 
         public void ApplyFieldEffect()

src/Perpetuum/Zones/LandMines/LandMine.cs

@@ -115,7 +115,11 @@ public override void AcceptVisitor(IEntityVisitor visitor)
 
         public override void OnUnitsFound(List<Player> unitsFound)
         {
-            throw new NotImplementedException();
+        }
+
+        protected override ProximityDeviceBase GetThis()
+        {
+            return this;
         }
         #endregion
     }

src/Perpetuum/Zones/ProximityProbes/ProximityDevice.cs

@@ -44,9 +44,11 @@ public virtual void CheckDeploymentAndThrow(IZone zone, Position spawnPosition)
             zone.Units.OfType<ProximityDeviceBase>().WithinRange(spawnPosition, DistanceConstants.PROXIMITY_PROBE_DEPLOY_RANGE_FROM_PROBE).Any().ThrowIfTrue(ErrorCodes.TooCloseToOtherDevice);
         }
 
+        protected abstract ProximityDeviceBase GetThis();
+
         public void SetDespawnTime(TimeSpan despawnTime)
         {
-            _despawnHelper = UnitDespawnHelper.Create(this, despawnTime);
+            _despawnHelper = UnitDespawnHelper.Create(GetThis(), despawnTime);
             _despawnHelper.DespawnStrategy = Kill;
         }
 

src/Perpetuum/Zones/ProximityProbes/ProximityProbe.cs

@@ -102,7 +102,11 @@ public override void OnUnitsFound(List<Player> unitsFound)
 
         public override void OnUnitsFound(List<Robot> unitsFound)
         {
-            throw new System.NotImplementedException();
+        }
+
+        protected override ProximityDeviceBase GetThis()
+        {
+            return this;
         }
     }
 }