PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-04-29 15:55:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes after rebasing on master - changed implant initialization from milliseconds to seconds and removed now unneeded implant initialization

Browse source
This commit is contained in:
Mazo 2020-03-28 17:49:23 +00:00
parent e4902a317c
commit 4b25205c32
4 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala
View file

@ -51,47 +51,47 @@ object GlobalDefinitions {
Implants Implants
*/ */
val advanced_regen = ImplantDefinition(0) val advanced_regen = ImplantDefinition(0)
advanced_regen.InitializationDuration = 120000 advanced_regen.InitializationDuration = 120
advanced_regen.StaminaCost = 2 advanced_regen.StaminaCost = 2
advanced_regen.CostIntervalDefault = 500 advanced_regen.CostIntervalDefault = 500
val targeting = ImplantDefinition(1) val targeting = ImplantDefinition(1)
targeting.InitializationDuration = 60000 targeting.InitializationDuration = 60
val audio_amplifier = ImplantDefinition(2) val audio_amplifier = ImplantDefinition(2)
audio_amplifier.InitializationDuration = 60000 audio_amplifier.InitializationDuration = 60
audio_amplifier.StaminaCost = 1 audio_amplifier.StaminaCost = 1
audio_amplifier.CostIntervalDefault = 1000 audio_amplifier.CostIntervalDefault = 1000
val darklight_vision = ImplantDefinition(3) val darklight_vision = ImplantDefinition(3)
darklight_vision.InitializationDuration = 60000 darklight_vision.InitializationDuration = 60
darklight_vision.ActivationStaminaCost = 3 darklight_vision.ActivationStaminaCost = 3
darklight_vision.StaminaCost = 1 darklight_vision.StaminaCost = 1
darklight_vision.CostIntervalDefault = 500 darklight_vision.CostIntervalDefault = 500
val melee_booster = ImplantDefinition(4) val melee_booster = ImplantDefinition(4)
melee_booster.InitializationDuration = 120000 melee_booster.InitializationDuration = 120
melee_booster.StaminaCost = 10 melee_booster.StaminaCost = 10
val personal_shield = ImplantDefinition(5) val personal_shield = ImplantDefinition(5)
personal_shield.InitializationDuration = 120000 personal_shield.InitializationDuration = 120
personal_shield.StaminaCost = 1 personal_shield.StaminaCost = 1
personal_shield.CostIntervalDefault = 600 personal_shield.CostIntervalDefault = 600
val range_magnifier = ImplantDefinition(6) val range_magnifier = ImplantDefinition(6)
range_magnifier.InitializationDuration = 60000 range_magnifier.InitializationDuration = 60
val second_wind = ImplantDefinition(7) val second_wind = ImplantDefinition(7)
second_wind.InitializationDuration = 180000 second_wind.InitializationDuration = 180
val silent_run = ImplantDefinition(8) val silent_run = ImplantDefinition(8)
silent_run.InitializationDuration = 90000 silent_run.InitializationDuration = 90
silent_run.StaminaCost = 1 silent_run.StaminaCost = 1
silent_run.CostIntervalDefault = 333 silent_run.CostIntervalDefault = 333
silent_run.CostIntervalByExoSuitHashMap(ExoSuitType.Agile) = 1000 silent_run.CostIntervalByExoSuitHashMap(ExoSuitType.Agile) = 1000
val surge = ImplantDefinition(9) val surge = ImplantDefinition(9)
surge.InitializationDuration = 90000 surge.InitializationDuration = 90
surge.StaminaCost = 1 surge.StaminaCost = 1
surge.CostIntervalDefault = 1000 surge.CostIntervalDefault = 1000
surge.CostIntervalByExoSuitHashMap(ExoSuitType.Agile) = 500 surge.CostIntervalByExoSuitHashMap(ExoSuitType.Agile) = 500

2
common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala
View file

@ -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))) player.Zone.AvatarEvents ! AvatarServiceMessage(player.Zone.Id, AvatarAction.SendResponse(player.GUID, ActionProgressMessage(slot + 6, 0)))
// Callback after initialization timer to complete initialization // 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) => case Player.ImplantInitializationComplete(slot: Int) =>

4
common/src/test/scala/objects/ImplantTest.scala
View file

@ -8,7 +8,7 @@ import org.specs2.mutable._
class ImplantTest extends Specification { class ImplantTest extends Specification {
val sample = new ImplantDefinition(8) //variant of sensor shield/silent run 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.ActivationStaminaCost = 3
sample.StaminaCost = 1 sample.StaminaCost = 1
sample.CostIntervalDefault = 1000 sample.CostIntervalDefault = 1000
@ -16,7 +16,7 @@ class ImplantTest extends Specification {
"ImplantDefinition" should { "ImplantDefinition" should {
"define" in { "define" in {
sample.InitializationDuration mustEqual 90000 sample.InitializationDuration mustEqual 90
sample.ActivationStaminaCost mustEqual 3 sample.ActivationStaminaCost mustEqual 3
sample.StaminaCost mustEqual 1 sample.StaminaCost mustEqual 1
sample.GetCostIntervalByExoSuit(ExoSuitType.Reinforced) mustEqual 1000 // Default value sample.GetCostIntervalByExoSuit(ExoSuitType.Reinforced) mustEqual 1000 // Default value

14
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -1303,7 +1303,8 @@ class WorldSessionActor extends Actor
InitializeDeployableQuantities(avatar) //set deployables ui elements InitializeDeployableQuantities(avatar) //set deployables ui elements
AwardBattleExperiencePoints(avatar, 20000000L) AwardBattleExperiencePoints(avatar, 20000000L)
avatar.CEP = 600000 avatar.CEP = 600000
avatar.Implants(0).Unlocked = true
avatar.Implants(0).Unlocked = true
avatar.Implants(0).Implant = GlobalDefinitions.darklight_vision avatar.Implants(0).Implant = GlobalDefinitions.darklight_vision
avatar.Implants(1).Unlocked = true avatar.Implants(1).Unlocked = true
avatar.Implants(1).Implant = GlobalDefinitions.surge avatar.Implants(1).Implant = GlobalDefinitions.surge
@ -1312,17 +1313,6 @@ class WorldSessionActor extends Actor
player = new Player(avatar) 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: //xy-coordinates indicate sanctuary spawn bias:
player.Position = math.abs(scala.util.Random.nextInt() % avatar.name.hashCode % 4) match { player.Position = math.abs(scala.util.Random.nextInt() % avatar.name.hashCode % 4) match {
case 0 => Vector3(8192, 8192, 0) //NE case 0 => Vector3(8192, 8192, 0) //NE