Spark teleport

src/Perpetuum.ExportedTypes/CategoryFlags.cs

@@ -669,5 +669,6 @@ public enum CategoryFlags : long
         cf_zone_objects = 0x0000000000000092,
         def_pbs_dogtags = 0x0000000000000691,
         cf_respec_tokens = 0x000000000004049B,
+        cf_spark_teleport_devices = 0x000000000005049B,
     }
 }

src/Perpetuum.RequestHandlers/Sparks/SparkTeleportUse.cs

@@ -1,5 +1,3 @@
-using System.Linq;
-using System.Transactions;
 using Perpetuum.Accounting.Characters;
 using Perpetuum.Common.Loggers.Transaction;
 using Perpetuum.Data;
@@ -10,6 +8,8 @@
 using Perpetuum.Robots;
 using Perpetuum.Services.ExtensionService;
 using Perpetuum.Services.Sparks.Teleports;
+using System.Linq;
+using System.Transactions;
 
 namespace Perpetuum.RequestHandlers.Sparks
 {
@@ -18,7 +18,7 @@ public class SparkTeleportUse : IRequestHandler
         private readonly IExtensionReader _extensionReader;
         private readonly SparkTeleportHelper _sparkTeleportHelper;
 
-        public SparkTeleportUse(IExtensionReader extensionReader,SparkTeleportHelper sparkTeleportHelper)
+        public SparkTeleportUse(IExtensionReader extensionReader, SparkTeleportHelper sparkTeleportHelper)
         {
             _extensionReader = extensionReader;
             _sparkTeleportHelper = sparkTeleportHelper;
@@ -32,19 +32,19 @@ public void HandleRequest(IRequest request)
                 var character = request.Session.Character;
 
                 character.IsDocked.ThrowIfFalse(ErrorCodes.CharacterHasToBeDocked);
-                character.CheckNextAvailableUndockTimeAndThrowIfFailed();
-                CheckExtensionLevelAndThrowIfFailed(character);
+                //character.CheckNextAvailableUndockTimeAndThrowIfFailed();
+                //CheckExtensionLevelAndThrowIfFailed(character);
 
                 var sparkTeleport = _sparkTeleportHelper.Get(id);
                 var currentDockingBase = character.GetCurrentDockingBase();
 
                 character.SubtractFromWallet(TransactionType.SparkTeleportUse, SparkTeleport.SPARK_TELEPORT_USE_FEE);
 
-                if ( sparkTeleport.DockingBase == currentDockingBase)
+                if (sparkTeleport.DockingBase == currentDockingBase)
                     throw new PerpetuumException(ErrorCodes.YouAreHereAlready);
 
                 sparkTeleport.DockingBase.IsDockingAllowed(character).ThrowIfError();
-                sparkTeleport.DockingBase.DockIn(character,Player.NormalUndockDelay);
+                sparkTeleport.DockingBase.DockIn(character, Player.NormalUndockDelay);
 
                 var robot = sparkTeleport.DockingBase.GetPublicContainerWithItems(character)
                     .GetFullTree()
@@ -61,11 +61,11 @@ public void HandleRequest(IRequest request)
                         .WithData(sparkTeleport.ToDictionary())
                         .Send();
                 });
-                
+
                 scope.Complete();
             }
         }
-        
+
         private void CheckExtensionLevelAndThrowIfFailed(Character character)
         {
             var liveSparkTeleports = _sparkTeleportHelper.GetAllSparkTeleports(character);

src/Perpetuum.RequestHandlers/UseLotteryItem.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Transactions;
 using Perpetuum.Accounting;
 using Perpetuum.Accounting.Characters;
 using Perpetuum.Common.Loggers.Transaction;
@@ -10,10 +6,11 @@
 using Perpetuum.EntityFramework;
 using Perpetuum.Host.Requests;
 using Perpetuum.Items;
-using Perpetuum.RequestHandlers.Extensions;
 using Perpetuum.Robots;
-using Perpetuum.Services.ExtensionService;
-using Perpetuum.Zones;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Transactions;
 
 namespace Perpetuum.RequestHandlers
 {
@@ -58,6 +55,10 @@ public void HandleRequest(IRequest request)
             {
                 HandleRespecToken(request, itemEid);
             }
+            else if (item is SparkTeleportDevice)
+            {
+                HandleSparkTeleportDevice(request, itemEid);
+            }
         }
 
         private void HandleLottery(IRequest request)
@@ -291,5 +292,51 @@ private void HandleRespecToken(IRequest request, long itemEid)
                 }
             });
         }
+
+        private void HandleSparkTeleportDevice(IRequest request, long itemEid)
+        {
+            var baseId = 0;
+            using (var scope = Db.CreateTransaction())
+            {
+                var containerEid = request.Data.GetOrDefault<long>(k.containerEID);
+                var character = request.Session.Character;
+                var account = accountManager.Repository
+                    .Get(request.Session.AccountId)
+                    .ThrowIfNull(ErrorCodes.AccountNotFound);
+
+                (character.IsDocked).ThrowIfFalse(ErrorCodes.CharacterHasToBeDocked);
+
+                var container = Container.GetWithItems(containerEid, character);
+
+                var containerItem = (SparkTeleportDevice)container
+                    .GetItemOrThrow(itemEid, true)
+                    .Unstack(1);
+
+                baseId = containerItem.BaseId;
+
+                entityServices.Repository.Delete(containerItem);
+                container.Save();
+                LogActivation(character, container, containerItem);
+
+                Transaction.Current.OnCommited(() =>
+                {
+                    accountRepository.Update(account);
+                });
+
+                scope.Complete();
+            }
+
+            var sparkTeleportData = new Dictionary<string, object>
+            {
+                { k.ID, baseId },
+            };
+
+            var sparkTeleportRequest = new Request();
+            sparkTeleportRequest.Command = Commands.SparkTeleportUse;
+            sparkTeleportRequest.Session = request.Session;
+            sparkTeleportRequest.Data = sparkTeleportData;
+
+            request.Session.HandleLocalRequest(sparkTeleportRequest);
+        }
     }
 }

src/Perpetuum/Items/SparkTeleportDevice.cs

@@ -0,0 +1,25 @@
+using Perpetuum.Accounting;
+using Perpetuum.Accounting.Characters;
+using Perpetuum.Common.Loggers.Transaction;
+using Perpetuum.Data;
+using Perpetuum.Host.Requests;
+using Perpetuum.Players;
+using Perpetuum.Robots;
+using Perpetuum.Services.Sparks.Teleports;
+using System;
+using System.Collections.Generic;
+using System.Transactions;
+
+namespace Perpetuum.Items
+{
+    public class SparkTeleportDevice : Item
+    {
+        public int BaseId
+        {
+            get
+            {
+                return ED.Options.GetOption<int>("baseId");
+            }
+        }
+    }
+}

src/Perpetuum/Perpetuum.csproj

@@ -226,6 +226,7 @@
     <Compile Include="Items\Paint.cs" />
     <Compile Include="Items\PropertyModifierCollection.cs" />
     <Compile Include="Items\RespecToken.cs" />
+    <Compile Include="Items\SparkTeleportDevice.cs" />
     <Compile Include="Items\Templates\CachedRobotTemplateReader.cs" />
     <Compile Include="Items\Templates\IRobotTemplateReader.cs" />
     <Compile Include="Items\Templates\IRobotTemplateRelation.cs" />