Merge pull request #473 from OpenPerpetuum/SparkTeleportMissingChanges

- Added spark teleport changes that were lost during branches rebase
OpenPerpetuum · Nov 18, 2023 · bdb863b · bdb863b
2 parents e575c2a + 3c563cc
commit bdb863b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/src/Perpetuum.RequestHandlers/Sparks/SparkTeleportUse.cs b/src/Perpetuum.RequestHandlers/Sparks/SparkTeleportUse.cs
@@ -35,10 +35,10 @@ public void HandleRequest(IRequest request)
                 //character.CheckNextAvailableUndockTimeAndThrowIfFailed();
                 //CheckExtensionLevelAndThrowIfFailed(character);
 
-                var sparkTeleport = _sparkTeleportHelper.Get(id);
+                var sparkTeleport = _sparkTeleportHelper.GetCommon(id);
                 var currentDockingBase = character.GetCurrentDockingBase();
 
-                character.SubtractFromWallet(TransactionType.SparkTeleportUse, SparkTeleport.SPARK_TELEPORT_USE_FEE);
+                //character.SubtractFromWallet(TransactionType.SparkTeleportUse, SparkTeleport.SPARK_TELEPORT_USE_FEE);
 
                 if (sparkTeleport.DockingBase == currentDockingBase)
                     throw new PerpetuumException(ErrorCodes.YouAreHereAlready);

diff --git a/src/Perpetuum/Services/Sparks/Teleports/ISparkTeleportRepository.cs b/src/Perpetuum/Services/Sparks/Teleports/ISparkTeleportRepository.cs
@@ -6,7 +6,10 @@ namespace Perpetuum.Services.Sparks.Teleports
 {
     public interface ISparkTeleportRepository : IRepository<int,SparkTeleport>
     {
+        SparkTeleport GetCommon(int id);
+
         IEnumerable<SparkTeleport> GetAllByCharacter(Character character);
+
         IEnumerable<SparkTeleport> GetAllByDockingBase(DockingBase dockingBase);
     }
-}
+}
diff --git a/src/Perpetuum/Services/Sparks/Teleports/SparkTeleportHelper.cs b/src/Perpetuum/Services/Sparks/Teleports/SparkTeleportHelper.cs
@@ -23,6 +23,11 @@ public SparkTeleport Get(int sparkTeleportID)
             return _sparkTeleportRepository.Get(sparkTeleportID);
         }
 
+        public SparkTeleport GetCommon(int sparkTeleportID)
+        {
+            return _sparkTeleportRepository.GetCommon(sparkTeleportID);
+        }
+
         public SparkTeleport CreateSparkTeleport(DockingBase dockingBase, Character character)
         {
             var teleport = new SparkTeleport

diff --git a/src/Perpetuum/Services/Sparks/Teleports/SparkTeleportRepository.cs b/src/Perpetuum/Services/Sparks/Teleports/SparkTeleportRepository.cs
@@ -29,6 +29,18 @@ public SparkTeleport Get(int id)
             return CreateFromRecord(record);
         }
 
+        public SparkTeleport GetCommon(int id)
+        {
+            var record = Db.Query().CommandText("select * from charactersparkteleports where baseeid=@ID and characterid=0")
+                .SetParameter("@ID", id)
+                .ExecuteSingleRow();
+
+            if (record == null)
+                return null;
+
+            return CreateFromRecord(record);
+        }
+
         public IEnumerable<SparkTeleport> GetAll()
         {
             throw new NotImplementedException();