From 4b25205c32b853176aa60254069c2ce5c267ef40 Mon Sep 17 00:00:00 2001 From: Mazo Date: Sat, 28 Mar 2020 17:49:23 +0000 Subject: [PATCH] Fixes after rebasing on master - changed implant initialization from milliseconds to seconds and removed now unneeded implant initialization --- .../psforever/objects/GlobalDefinitions.scala | 20 +++++++++---------- .../objects/avatar/PlayerControl.scala | 2 +- .../src/test/scala/objects/ImplantTest.scala | 4 ++-- .../src/main/scala/WorldSessionActor.scala | 14 ++----------- 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index df99f93c..c14dfab7 100644 --- a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -51,47 +51,47 @@ object GlobalDefinitions { Implants */ val advanced_regen = ImplantDefinition(0) - advanced_regen.InitializationDuration = 120000 + advanced_regen.InitializationDuration = 120 advanced_regen.StaminaCost = 2 advanced_regen.CostIntervalDefault = 500 val targeting = ImplantDefinition(1) - targeting.InitializationDuration = 60000 + targeting.InitializationDuration = 60 val audio_amplifier = ImplantDefinition(2) - audio_amplifier.InitializationDuration = 60000 + audio_amplifier.InitializationDuration = 60 audio_amplifier.StaminaCost = 1 audio_amplifier.CostIntervalDefault = 1000 val darklight_vision = ImplantDefinition(3) - darklight_vision.InitializationDuration = 60000 + darklight_vision.InitializationDuration = 60 darklight_vision.ActivationStaminaCost = 3 darklight_vision.StaminaCost = 1 darklight_vision.CostIntervalDefault = 500 val melee_booster = ImplantDefinition(4) - melee_booster.InitializationDuration = 120000 + melee_booster.InitializationDuration = 120 melee_booster.StaminaCost = 10 val personal_shield = ImplantDefinition(5) - personal_shield.InitializationDuration = 120000 + personal_shield.InitializationDuration = 120 personal_shield.StaminaCost = 1 personal_shield.CostIntervalDefault = 600 val range_magnifier = ImplantDefinition(6) - range_magnifier.InitializationDuration = 60000 + range_magnifier.InitializationDuration = 60 val second_wind = ImplantDefinition(7) - second_wind.InitializationDuration = 180000 + second_wind.InitializationDuration = 180 val silent_run = ImplantDefinition(8) - silent_run.InitializationDuration = 90000 + silent_run.InitializationDuration = 90 silent_run.StaminaCost = 1 silent_run.CostIntervalDefault = 333 silent_run.CostIntervalByExoSuitHashMap(ExoSuitType.Agile) = 1000 val surge = ImplantDefinition(9) - surge.InitializationDuration = 90000 + surge.InitializationDuration = 90 surge.StaminaCost = 1 surge.CostIntervalDefault = 1000 surge.CostIntervalByExoSuitHashMap(ExoSuitType.Agile) = 500 diff --git a/common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala b/common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala index 0f8dc502..7a427a13 100644 --- a/common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala +++ b/common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala @@ -77,7 +77,7 @@ class PlayerControl(player : Player) extends Actor player.Zone.AvatarEvents ! AvatarServiceMessage(player.Zone.Id, AvatarAction.SendResponse(player.GUID, ActionProgressMessage(slot + 6, 0))) // Callback after initialization timer to complete initialization - implantSlot.InitializeTimer = context.system.scheduler.scheduleOnce(implantSlot.MaxTimer milliseconds, self, Player.ImplantInitializationComplete(slot)) + implantSlot.InitializeTimer = context.system.scheduler.scheduleOnce(implantSlot.MaxTimer seconds, self, Player.ImplantInitializationComplete(slot)) } case Player.ImplantInitializationComplete(slot: Int) => diff --git a/common/src/test/scala/objects/ImplantTest.scala b/common/src/test/scala/objects/ImplantTest.scala index 337d563c..81b3d797 100644 --- a/common/src/test/scala/objects/ImplantTest.scala +++ b/common/src/test/scala/objects/ImplantTest.scala @@ -8,7 +8,7 @@ import org.specs2.mutable._ class ImplantTest extends Specification { val sample = new ImplantDefinition(8) //variant of sensor shield/silent run - sample.InitializationDuration = 90000 //1:30 + sample.InitializationDuration = 90 //1:30 sample.ActivationStaminaCost = 3 sample.StaminaCost = 1 sample.CostIntervalDefault = 1000 @@ -16,7 +16,7 @@ class ImplantTest extends Specification { "ImplantDefinition" should { "define" in { - sample.InitializationDuration mustEqual 90000 + sample.InitializationDuration mustEqual 90 sample.ActivationStaminaCost mustEqual 3 sample.StaminaCost mustEqual 1 sample.GetCostIntervalByExoSuit(ExoSuitType.Reinforced) mustEqual 1000 // Default value diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala index cdcd84b5..cb14a6e2 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -1303,7 +1303,8 @@ class WorldSessionActor extends Actor InitializeDeployableQuantities(avatar) //set deployables ui elements AwardBattleExperiencePoints(avatar, 20000000L) avatar.CEP = 600000 - avatar.Implants(0).Unlocked = true + + avatar.Implants(0).Unlocked = true avatar.Implants(0).Implant = GlobalDefinitions.darklight_vision avatar.Implants(1).Unlocked = true avatar.Implants(1).Implant = GlobalDefinitions.surge @@ -1312,17 +1313,6 @@ class WorldSessionActor extends Actor player = new Player(avatar) - (0 until DetailedCharacterData.numberOfImplantSlots(player.BEP)).foreach(slot => { - val implantSlot = player.ImplantSlot(slot) - if(implantSlot.Initialized) { - sendResponse(AvatarImplantMessage(player.GUID, ImplantAction.Initialization, slot, 1)) - } - else { - player.Actor ! Player.ImplantInitializationStart(slot) - } - //TODO if this implant is Installed but does not have shortcut, add to a free slot or write over slot 61/62/63 - }) - //xy-coordinates indicate sanctuary spawn bias: player.Position = math.abs(scala.util.Random.nextInt() % avatar.name.hashCode % 4) match { case 0 => Vector3(8192, 8192, 0) //NE