PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #685 from Mazo/bailable-seats

Browse source 
Allow vulture/liberator/ggs seats to be bailed from in motion
This commit is contained in:
Fate-JH 2021-02-08 10:36:46 -05:00 committed by GitHub
parent 29b56eb8a4 34444f5b66
commit b4d6e9172f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/scala/net/psforever/objects/GlobalDefinitions.scala
View file

@ -6647,8 +6647,10 @@ object GlobalDefinitions {
liberator.Seats(0).ControlledWeapon = 3
liberator.Seats += 1 -> new SeatDefinition()
liberator.Seats(1).ControlledWeapon = 4
liberator.Seats(1).Bailable = true
liberator.Seats += 2 -> new SeatDefinition()
liberator.Seats(2).ControlledWeapon = 5
liberator.Seats(2).Bailable = true
liberator.Weapons += 3 -> liberator_weapon_system
liberator.Weapons += 4 -> liberator_bomb_bay
liberator.Weapons += 5 -> liberator_25mm_cannon
@ -6688,8 +6690,10 @@ object GlobalDefinitions {
vulture.Seats(0).ControlledWeapon = 3
vulture.Seats += 1 -> new SeatDefinition()
vulture.Seats(1).ControlledWeapon = 4
vulture.Seats(1).Bailable = true
vulture.Seats += 2 -> new SeatDefinition()
vulture.Seats(2).ControlledWeapon = 5
vulture.Seats(2).Bailable = true
vulture.Weapons += 3 -> vulture_nose_weapon_system
vulture.Weapons += 4 -> vulture_bomb_bay
vulture.Weapons += 5 -> vulture_tail_cannon
@ -6804,14 +6808,19 @@ object GlobalDefinitions {
galaxy_gunship.Seats += 0 -> new SeatDefinition()
galaxy_gunship.Seats += 1 -> new SeatDefinition()
galaxy_gunship.Seats(1).ControlledWeapon = 6
galaxy_gunship.Seats(1).Bailable = true
galaxy_gunship.Seats += 2 -> new SeatDefinition()
galaxy_gunship.Seats(2).ControlledWeapon = 7
galaxy_gunship.Seats(2).Bailable = true
galaxy_gunship.Seats += 3 -> new SeatDefinition()
galaxy_gunship.Seats(3).ControlledWeapon = 8
galaxy_gunship.Seats(3).Bailable = true
galaxy_gunship.Seats += 4 -> new SeatDefinition()
galaxy_gunship.Seats(4).ControlledWeapon = 9
galaxy_gunship.Seats(4).Bailable = true
galaxy_gunship.Seats += 5 -> new SeatDefinition()
galaxy_gunship.Seats(5).ControlledWeapon = 10
galaxy_gunship.Seats(5).Bailable = true
galaxy_gunship.Weapons += 6 -> galaxy_gunship_cannon
galaxy_gunship.Weapons += 7 -> galaxy_gunship_cannon
galaxy_gunship.Weapons += 8 -> galaxy_gunship_tailgun

1
src/main/scala/net/psforever/objects/definition/SeatDefinition.scala
View file

@ -27,6 +27,7 @@ class SeatDefinition extends BasicDefinition {
restriction
}
/** Determines if the seat can be bailed from while the vehicle is in motion */
def Bailable: Boolean = {
this.bailable
}

1
src/main/scala/net/psforever/objects/vehicles/Seat.scala
View file

@ -61,6 +61,7 @@ class Seat(private val seatDef: SeatDefinition) {
seatDef.ArmorRestriction
}
/** Determines if the seat can be bailed from while the vehicle is in motion */
def Bailable: Boolean = {
seatDef.Bailable
}