PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-15 16:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

last minute minor corrections

Browse source
This commit is contained in:
FateJH 2019-11-14 13:51:08 -05:00
parent 693a3a5d78
commit ed7406f25f
4 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala
View file

@ -21,14 +21,24 @@ final case class DamageFeedbackMessage(unk1 : Int,
unk6 : Int) unk6 : Int)
extends PlanetSideGamePacket { extends PlanetSideGamePacket {
assert( assert(
if(unk2a.nonEmpty) unk2b.isEmpty && unk2c.isEmpty {
else if(unk2b.nonEmpty) unk2 && unk2a.isEmpty && unk2c.isEmpty val unk2aEmpty = unk2a.isEmpty
else unk2a.isEmpty && !unk2 && unk2b.isEmpty && unk2c.nonEmpty val unk2bEmpty = unk2b.isEmpty
val unk2cEmpty = unk2c.isEmpty
if(unk2a.nonEmpty) unk2bEmpty && unk2cEmpty
else if(unk2b.nonEmpty) unk2 && unk2aEmpty && unk2cEmpty
else unk2aEmpty && !unk2 && unk2bEmpty && unk2c.nonEmpty
}
) )
assert( assert(
if(unk3a.nonEmpty) unk3b.isEmpty && unk3c.isEmpty {
else if(unk3b.nonEmpty) unk3 && unk3a.isEmpty && unk3c.isEmpty val unk3aEmpty = unk3a.isEmpty
else unk3a.isEmpty && !unk3 && unk3b.isEmpty && unk3c.nonEmpty val unk3bEmpty = unk3b.isEmpty
val unk3cEmpty = unk3c.isEmpty
if(unk3a.nonEmpty) unk3bEmpty && unk3cEmpty
else if(unk3b.nonEmpty) unk3 && unk3aEmpty && unk3cEmpty
else unk3aEmpty && !unk3 && unk3bEmpty && unk3c.nonEmpty
}
) )
assert(unk3a.isEmpty == unk3d.nonEmpty) assert(unk3a.isEmpty == unk3d.nonEmpty)

7
common/src/main/scala/net/psforever/packet/game/DamageMessage.scala
View file

@ -6,6 +6,13 @@ import net.psforever.types.Angular
import scodec.Codec import scodec.Codec
import scodec.codecs._ import scodec.codecs._
/**
* na
* @param guid1 na
* @param unk1 na
* @param guid2 na
* @param unk2 na
*/
final case class DamageMessage(guid1 : PlanetSideGUID, final case class DamageMessage(guid1 : PlanetSideGUID,
unk1 : Int, unk1 : Int,
guid2 : PlanetSideGUID, guid2 : PlanetSideGUID,

2
common/src/test/scala/game/DamageFeedbackMessageTest.scala
View file

@ -37,7 +37,7 @@ class DamageFeedbackMessageTest extends Specification {
pkt mustEqual string pkt mustEqual string
} }
"failures" in { "assert catches" in {
//unk2: no parameters //unk2: no parameters
DamageFeedbackMessage(3, true, None, None, None, true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError] DamageFeedbackMessage(3, true, None, None, None, true, Some(PlanetSideGUID(2913)), None, None, None, 1, 2, 0) must throwA[AssertionError]
//unk2: two exclusive parameters //unk2: two exclusive parameters

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

@ -165,7 +165,6 @@ class WorldSessionActor extends Actor with MDCContextAware {
var cargoDismountTimer : Cancellable = DefaultCancellable.obj var cargoDismountTimer : Cancellable = DefaultCancellable.obj
var antChargingTick : Cancellable = DefaultCancellable.obj var antChargingTick : Cancellable = DefaultCancellable.obj
var antDischargingTick : Cancellable = DefaultCancellable.obj var antDischargingTick : Cancellable = DefaultCancellable.obj
var weaponAutoLockDecay : Cancellable = DefaultCancellable.obj
/** /**
@ -3491,7 +3490,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
import net.psforever.types.CertificationType._ import net.psforever.types.CertificationType._
val faction = PlanetSideEmpire.VS val faction = PlanetSideEmpire.VS
val avatar = new Avatar(41605313L+sessionId, s"TestCharacter$sessionId", PlanetSideEmpire.VS, CharacterGender.Female, 41, CharacterVoice.Voice1) val avatar = new Avatar(41605313L+sessionId, s"TestCharacter$sessionId", faction, CharacterGender.Female, 41, CharacterVoice.Voice1)
avatar.Certifications += StandardAssault avatar.Certifications += StandardAssault
avatar.Certifications += MediumAssault avatar.Certifications += MediumAssault
avatar.Certifications += StandardExoSuit avatar.Certifications += StandardExoSuit