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

importing the basics of the projectile/damage system from the Sounours Play-Live branch (51200); only modified how damage numbers and modifiers are interacted with and how a projectile's characteristics is accessed from the Tool that emits it; GlobalDefinitions could be imported over almost entirely, fortunately

Browse source
This commit is contained in:
FateJH 2018-06-12 21:51:53 -04:00
parent 8eb2d9cf80
commit 1bceb35226
9 changed files with 2444 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -236,6 +236,50 @@ class EquipmentTest extends Specification {
obj.AmmoType mustEqual Ammo.rocket
}
"projectile types and ammo types" in {
val suppressor_wep = Tool(suppressor)
suppressor_wep.ProjectileType mustEqual bullet_9mm_projectile.ProjectileType
suppressor_wep.NextAmmoType
suppressor_wep.ProjectileType mustEqual bullet_9mm_AP_projectile.ProjectileType
suppressor_wep.NextAmmoType
suppressor_wep.ProjectileType mustEqual bullet_9mm_projectile.ProjectileType
}
"projectile types and fire modes" in {
val pulsar_wep = Tool(pulsar)
pulsar_wep.ProjectileType mustEqual pulsar_projectile.ProjectileType
pulsar_wep.NextFireMode
pulsar_wep.ProjectileType mustEqual pulsar_ap_projectile.ProjectileType
pulsar_wep.NextFireMode
pulsar_wep.ProjectileType mustEqual pulsar_projectile.ProjectileType
}
"projectile types and fire modes / ammo types" in {
val punisher_wep = Tool(punisher)
punisher_wep.ProjectileType mustEqual bullet_9mm_projectile.ProjectileType
punisher_wep.NextAmmoType
punisher_wep.ProjectileType mustEqual bullet_9mm_AP_projectile.ProjectileType
punisher_wep.NextFireMode
punisher_wep.ProjectileType mustEqual rocket_projectile.ProjectileType
punisher_wep.NextAmmoType
punisher_wep.ProjectileType mustEqual frag_cartridge_projectile.ProjectileType
punisher_wep.NextAmmoType
punisher_wep.ProjectileType mustEqual jammer_cartridge_projectile.ProjectileType
punisher_wep.NextFireMode
punisher_wep.ProjectileType mustEqual bullet_9mm_AP_projectile.ProjectileType
punisher_wep.NextAmmoType
punisher_wep.ProjectileType mustEqual bullet_9mm_projectile.ProjectileType
punisher_wep.NextFireMode
punisher_wep.ProjectileType mustEqual jammer_cartridge_projectile.ProjectileType
punisher_wep.NextAmmoType
punisher_wep.ProjectileType mustEqual plasma_cartridge_projectile.ProjectileType
punisher_wep.NextAmmoType
punisher_wep.ProjectileType mustEqual rocket_projectile.ProjectileType
}
"discharge (1)" in {
val obj = Tool(GlobalDefinitions.punisher)
obj.Magazine mustEqual 30