enhancing the three primary character codecs thanks to new analysis

This commit is contained in:
FateJH 2018-10-04 23:12:07 -04:00
parent a1ce8ac1f3
commit bf72d553e1
9 changed files with 59 additions and 121 deletions

View file

@ -38,7 +38,6 @@ class CharacterDataTest extends Specification {
basic.app.sex mustEqual CharacterGender.Male
basic.app.head mustEqual 5
basic.app.voice mustEqual CharacterVoice.Voice5
basic.voice2 mustEqual 3
basic.black_ops mustEqual false
basic.jammered mustEqual false
basic.exosuit mustEqual ExoSuitType.Reinforced
@ -60,8 +59,8 @@ class CharacterDataTest extends Specification {
char.armor mustEqual 253
char.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade
char.command_rank mustEqual 5
char.implant_effects.isDefined mustEqual true
char.implant_effects.get mustEqual ImplantEffects.NoEffects
char.implant_effects.length mustEqual 1
char.implant_effects.head mustEqual ImplantEffects.NoEffects
char.cosmetics.isDefined mustEqual true
char.cosmetics.get.no_helmet mustEqual true
char.cosmetics.get.beret mustEqual true
@ -131,7 +130,6 @@ class CharacterDataTest extends Specification {
basic.app.sex mustEqual CharacterGender.Male
basic.app.head mustEqual 5
basic.app.voice mustEqual CharacterVoice.Voice5
basic.voice2 mustEqual 3
basic.black_ops mustEqual false
basic.jammered mustEqual false
basic.exosuit mustEqual ExoSuitType.Reinforced
@ -175,7 +173,6 @@ class CharacterDataTest extends Specification {
basic.app.sex mustEqual CharacterGender.Male
basic.app.head mustEqual 10
basic.app.voice mustEqual CharacterVoice.Voice2
basic.voice2 mustEqual 0
basic.black_ops mustEqual false
basic.jammered mustEqual false
basic.exosuit mustEqual ExoSuitType.MAX
@ -197,7 +194,7 @@ class CharacterDataTest extends Specification {
char.armor mustEqual 0
char.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade
char.command_rank mustEqual 2
char.implant_effects.isDefined mustEqual false
char.implant_effects.isEmpty mustEqual true
char.cosmetics.isDefined mustEqual true
char.cosmetics.get.no_helmet mustEqual true
char.cosmetics.get.beret mustEqual true
@ -228,7 +225,6 @@ class CharacterDataTest extends Specification {
5,
CharacterVoice.Voice5
),
3,
false,
false,
ExoSuitType.Reinforced,
@ -250,7 +246,7 @@ class CharacterDataTest extends Specification {
255, 253,
UniformStyle.ThirdUpgrade,
5,
Some(ImplantEffects.NoEffects),
List(ImplantEffects.NoEffects),
Some(Cosmetics(true, true, true, true, false))
)
val inv = InventoryData(
@ -284,7 +280,6 @@ class CharacterDataTest extends Specification {
5,
CharacterVoice.Voice5
),
3,
false,
false,
ExoSuitType.Reinforced,
@ -306,7 +301,7 @@ class CharacterDataTest extends Specification {
255, 253,
UniformStyle.ThirdUpgrade,
5,
Some(ImplantEffects.NoEffects),
List(ImplantEffects.NoEffects),
Some(Cosmetics(true, true, true, true, false))
)
val inv = InventoryData(
@ -337,7 +332,6 @@ class CharacterDataTest extends Specification {
10,
CharacterVoice.Voice2
),
0,
false,
false,
ExoSuitType.MAX,
@ -359,7 +353,7 @@ class CharacterDataTest extends Specification {
0, 0,
UniformStyle.ThirdUpgrade,
2,
None,
List(),
Some(Cosmetics(true, true, true, true, false))
)
val obj = PlayerData(pos, app, char, DrawnSlot.Pistol1)

View file

@ -39,7 +39,6 @@ class DetailedCharacterDataTest extends Specification {
basic.app.sex mustEqual CharacterGender.Female
basic.app.head mustEqual 41
basic.app.voice mustEqual CharacterVoice.Voice1
basic.voice2 mustEqual 3
basic.black_ops mustEqual false
basic.jammered mustEqual false
basic.exosuit mustEqual ExoSuitType.Standard
@ -63,9 +62,6 @@ class DetailedCharacterDataTest extends Specification {
char.healthMax mustEqual 100
char.health mustEqual 100
char.armor mustEqual 50 //standard exosuit value
char.unk1 mustEqual 1
char.unk2 mustEqual 7
char.unk3 mustEqual 7
char.staminaMax mustEqual 100
char.stamina mustEqual 100
char.certs.length mustEqual 7
@ -175,7 +171,6 @@ class DetailedCharacterDataTest extends Specification {
basic.app.sex mustEqual CharacterGender.Female
basic.app.head mustEqual 41
basic.app.voice mustEqual CharacterVoice.Voice1
basic.voice2 mustEqual 3
basic.black_ops mustEqual false
basic.jammered mustEqual false
basic.exosuit mustEqual ExoSuitType.Standard
@ -199,9 +194,6 @@ class DetailedCharacterDataTest extends Specification {
char.healthMax mustEqual 100
char.health mustEqual 100
char.armor mustEqual 50 //standard exosuit value
char.unk1 mustEqual 1
char.unk2 mustEqual 7
char.unk3 mustEqual 7
char.staminaMax mustEqual 100
char.stamina mustEqual 100
char.certs.length mustEqual 7
@ -382,7 +374,6 @@ class DetailedCharacterDataTest extends Specification {
41,
CharacterVoice.Voice1
),
3,
false,
false,
ExoSuitType.Standard,
@ -402,7 +393,6 @@ class DetailedCharacterDataTest extends Specification {
0,
100, 100,
50,
1, 7, 7,
100, 100,
List(
CertificationType.StandardAssault,
@ -453,7 +443,6 @@ class DetailedCharacterDataTest extends Specification {
41,
CharacterVoice.Voice1
),
3,
false,
false,
ExoSuitType.Standard,
@ -473,7 +462,6 @@ class DetailedCharacterDataTest extends Specification {
0,
100, 100,
50,
1, 7, 7,
100, 100,
List(
CertificationType.StandardAssault,
@ -520,7 +508,6 @@ class DetailedCharacterDataTest extends Specification {
)
val app : (Int)=>CharacterAppearanceData = CharacterAppearanceData(
BasicCharacterData("KiCkJr", PlanetSideEmpire.NC, CharacterGender.Male, 24, CharacterVoice.Voice4),
3,
false, false,
ExoSuitType.Agile,
"",
@ -541,7 +528,6 @@ class DetailedCharacterDataTest extends Specification {
6366766,
694787,
100, 100, 100,
1, 7, 7,
100, 46,
List(
CertificationType.StandardAssault,

View file

@ -57,7 +57,6 @@ class MountedVehiclesTest extends Specification {
app.app.sex mustEqual CharacterGender.Male
app.app.head mustEqual 5
app.app.voice mustEqual CharacterVoice.Voice5
app.voice2 mustEqual 3
app.black_ops mustEqual false
app.lfs mustEqual false
app.outfit_name mustEqual "Black Beret Armoured Corps"
@ -76,7 +75,7 @@ class MountedVehiclesTest extends Specification {
char.armor mustEqual 0
char.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade
char.command_rank mustEqual 5
char.implant_effects mustEqual None
char.implant_effects.isEmpty mustEqual true
char.cosmetics mustEqual Some(Cosmetics(true, true, true, true, false))
inv.size mustEqual 4
inv.head.objectClass mustEqual ObjectClass.medicalapplicator
@ -107,7 +106,6 @@ class MountedVehiclesTest extends Specification {
"encode (Scrawny Ronnie's mosquito)" in {
val app : (Int)=>CharacterAppearanceData = CharacterAppearanceData(
BasicCharacterData("ScrawnyRonnie", PlanetSideEmpire.TR, CharacterGender.Male, 5, CharacterVoice.Voice5),
3,
false, false,
ExoSuitType.Agile,
"Black Beret Armoured Corps",
@ -128,7 +126,7 @@ class MountedVehiclesTest extends Specification {
UniformStyle.ThirdUpgrade,
0,
5,
None,
Nil,
Some(Cosmetics(true, true, true, true, false))
)
val inv : InventoryData = InventoryData(