Merge branch 'Development' into bugfix/UnexpectedCharacters

OpenPerpetuum · Dec 8, 2023 · 6f0e4f4 · 6f0e4f4
2 parents 276b975 + bdb863b
commit 6f0e4f4
Show file tree

Hide file tree

Showing 30 changed files with 938 additions and 574 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+<span style="display:block;text-align:center">![opp-server](opp-server.jpeg)
+
 # The Open Perpetuum Server
 This is a fork of the Official Perpetuum Server as released by Avatar Creations [here](https://github.com/PerpetuumOnline/PerpetuumServer).  
 This server is developed under the direction of the [Open Perpetuum Project](https://openperpetuum.com) game design and development team; a 100% volunteer opensource player development and persistent Perpetuum Server hosting project.

diff --git a/opp-server.jpeg b/opp-server.jpeg
diff --git a/src/Perpetuum.Bootstrapper/PerpetuumBootstrapper.cs b/src/Perpetuum.Bootstrapper/PerpetuumBootstrapper.cs
diff --git a/src/Perpetuum.ExportedTypes/CategoryFlags.cs b/src/Perpetuum.ExportedTypes/CategoryFlags.cs
@@ -126,6 +126,9 @@ public enum CategoryFlags : long
         cf_ct_capsules_robot_thelodica_heavymech = 0x000004020303049B,
         cf_ct_capsules_robot_thelodica_light = 0x000001020303049B,
         cf_ct_capsules_robot_thelodica_mech = 0x000003020303049B,
+
+        cf_respec_token = 0x000000000004049B,
+
         cf_datashards = 0x0000000000000694,
         cf_decor = 0x000000000000005A,
         cf_decor_buildings = 0x000000000000055A,
@@ -664,6 +667,8 @@ public enum CategoryFlags : long
         cf_world_mobile_teleport_capsule = 0x0000000000020198,
         cf_zone_item_shop = 0x0000000000000796,
         cf_zone_objects = 0x0000000000000092,
-        def_pbs_dogtags = 0x0000000000000691
+        def_pbs_dogtags = 0x0000000000000691,
+        cf_respec_tokens = 0x000000000004049B,
+        cf_spark_teleport_devices = 0x000000000005049B,
     }
 }
diff --git a/src/Perpetuum.ExportedTypes/DefinitionNames.cs b/src/Perpetuum.ExportedTypes/DefinitionNames.cs
@@ -1063,7 +1063,10 @@ public static class DefinitionNames
  		 public const string HYBRID_ROBOT = "def_hybrid_robot";
  		 public const string HYDROBENOL = "def_hydrobenol";
  		 public const string ICE = "def_ice";
- 		 public const string ICS_MISSION_COIN = "def_ics_mission_coin";
+
+        public const string RESPEC_TOKEN = "def_respec_token";
+
+         public const string ICS_MISSION_COIN = "def_ics_mission_coin";
  		 public const string ICS_ZONE_ITEM_SHOP = "def_ics_zone_item_shop";
  		 public const string ICTUS_BOT = "def_ictus_bot";
  		 public const string ICTUS_BOT_CPRG = "def_ictus_bot_cprg";

diff --git a/src/Perpetuum.RequestHandlers/Extensions/ExtensionResetCharacter.cs b/src/Perpetuum.RequestHandlers/Extensions/ExtensionResetCharacter.cs
@@ -6,33 +6,27 @@
 
 namespace Perpetuum.RequestHandlers.Extensions
 {
-
-
     /// <summary>
     /// Reset character extension for account credit ... not used yet
     /// </summary>
     public class ExtensionResetCharacter : IRequestHandler
     {
-        private readonly IAccountManager _accountManager;
-        private readonly IAccountRepository _accountRepository;
-        private readonly MtProductHelper _mtProductHelper;
+        private readonly IAccountManager accountManager;
 
-        public ExtensionResetCharacter(IAccountManager accountManager,IAccountRepository accountRepository,MtProductHelper mtProductHelper)
+        public ExtensionResetCharacter(IAccountManager accountManager)
         {
-            _accountManager = accountManager;
-            _accountRepository = accountRepository;
-            _mtProductHelper = mtProductHelper;
+            this.accountManager = accountManager;
         }
 
         public void HandleRequest(IRequest request)
         {
             using (var scope = Db.CreateTransaction())
             {
-                var account = _accountManager.Repository.Get(request.Session.AccountId).ThrowIfNull(ErrorCodes.AccountNotFound);
+                var account = accountManager.Repository.Get(request.Session.AccountId).ThrowIfNull(ErrorCodes.AccountNotFound);
 
                 var character = Character.Get(request.Data.GetOrDefault<int>(k.characterID));
-            
-                if ( character == Character.None )
+
+                if (character == Character.None)
                     throw new PerpetuumException(ErrorCodes.CharacterNotFound);
 
                 //only characters that belong to the issuers account
@@ -43,57 +37,30 @@ public void HandleRequest(IRequest request)
 
                 (character.IsDocked).ThrowIfFalse(ErrorCodes.CharacterHasToBeDocked);
 
-                var product = _mtProductHelper.GetByAccountTransactionType(AccountTransactionType.ExtensionReset);
-                var wallet = _accountManager.GetWallet(account,AccountTransactionType.ExtensionReset);
-
-                wallet.Balance -= product.price; 
-
-                var e = new AccountTransactionLogEvent(account,AccountTransactionType.ExtensionReset)
-                {
-                    Credit = wallet.Balance, 
-                    CreditChange = -product.price
-                };
-
-                _accountManager.LogTransaction(e);
-
-                _accountRepository.Update(account);
-
                 //current extensions
                 var extensionCollection = character.GetExtensions();
 
                 //default extensions
                 var defaultExtensionHandler = new CharacterDefaultExtensionHelper(character);
-            
+
                 foreach (var extension in extensionCollection)
                 {
                     //returns 0 if the extension is not starter extension
                     //returns the minimum level if the extension is starter
                     int newLevel;
-                    defaultExtensionHandler.IsStartingExtension( extension, out newLevel);
-                
+                    defaultExtensionHandler.IsStartingExtension(extension, out newLevel);
+
                     var resultExtension = new Extension(extension.id, newLevel);
-                
+
                     character.SetExtension(resultExtension);
                 }
 
                 character.DeleteAllSpentPoints();
 
-                //ezt nem csinalja, csak nyersen reseteli az extensionoket
-                /*
-            ExtensionHelper.DeleteAllNonForeverPenaltyPoints(character);
-            */
-
-                // %%% itt hagytuk abba
-
                 Message.Builder.FromRequest(request).WithOk().Send();
-                
+
                 scope.Complete();
             }
-
         }
-
-
-
-
     }
-}
+}
diff --git a/src/Perpetuum.RequestHandlers/Sparks/SparkTeleportUse.cs b/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 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)
+                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);