PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-02-26 18:13:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reviving a player will drain 25 rounds after revival is complete, instead of on each progress tick (#505)

Browse source
This commit is contained in:
Mazo 2020-06-29 18:01:16 +01:00 • committed by GitHub
parent d1e7d8f8e0
commit 5437b3f068
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 47 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

22
common/src/test/scala/objects/EquipmentTest.scala
View file

@ -308,10 +308,10 @@ class EquipmentTest extends Specification {
"discharge (1)" in {
val obj = Tool(GlobalDefinitions.punisher)
obj.Magazine mustEqual 30
obj.Discharge
obj.Discharge()
obj.Magazine mustEqual 29
obj.Discharge
obj.Discharge
obj.Discharge()
obj.Discharge()
obj.Magazine mustEqual 27
}
@ -320,20 +320,20 @@ class EquipmentTest extends Specification {
obj.Magazine mustEqual 12
obj.AmmoSlot.Chamber mustEqual 8
obj.Discharge
obj.Discharge()
obj.Magazine mustEqual 12
obj.AmmoSlot.Chamber mustEqual 7
obj.Discharge
obj.Discharge
obj.Discharge()
obj.Discharge()
obj.Magazine mustEqual 12
obj.AmmoSlot.Chamber mustEqual 5
obj.Discharge
obj.Discharge
obj.Discharge
obj.Discharge
obj.Discharge()
obj.Discharge()
obj.Discharge()
obj.Discharge()
obj.Magazine mustEqual 12
obj.AmmoSlot.Chamber mustEqual 1
obj.Discharge
obj.Discharge()
obj.Magazine mustEqual 11
obj.AmmoSlot.Chamber mustEqual 8
}

28
common/src/test/scala/objects/FireModeTest.scala
View file

@ -58,10 +58,10 @@ class FireModeTest extends Specification {
obj.FireMode.Chamber mustEqual 1
obj.Magazine mustEqual 16
obj.Discharge
obj.Discharge()
obj.Magazine mustEqual 15
obj.Discharge
obj.Discharge
obj.Discharge()
obj.Discharge()
obj.Magazine mustEqual 13
}
}
@ -84,17 +84,17 @@ class FireModeTest extends Specification {
obj.FireMode.Chamber mustEqual 8
obj.Magazine mustEqual 12
obj.Discharge //1
obj.Discharge() //1
obj.Magazine mustEqual 12
obj.Discharge //2
obj.Discharge //3
obj.Discharge() //2
obj.Discharge() //3
obj.Magazine mustEqual 12
obj.Discharge //4
obj.Discharge //5
obj.Discharge //6
obj.Discharge //7
obj.Discharge() //4
obj.Discharge() //5
obj.Discharge() //6
obj.Discharge() //7
obj.Magazine mustEqual 12
obj.Discharge //8
obj.Discharge() //8
obj.Magazine mustEqual 11
}
}
@ -117,10 +117,10 @@ class FireModeTest extends Specification {
obj.FireMode.Chamber mustEqual 1
obj.Magazine mustEqual 1
obj.Discharge
obj.Discharge()
obj.Magazine mustEqual 1
obj.Discharge
obj.Discharge
obj.Discharge()
obj.Discharge()
obj.Magazine mustEqual 1
}
}