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 #793 from psforever/Corrected/Removed-some-temporary-values

Browse source 
Corrected/Removed some temporary values
This commit is contained in:
NickPSF 2021-04-25 16:36:51 -05:00 committed by GitHub
parent 4832bee71f d1e9361687
commit 478465e361
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6441,11 +6441,11 @@ object GlobalDefinitions {
ant.Geometry = GeometryForm.representByCylinder(radius = 2.16795f, height = 2.09376f) //TODO hexahedron ant.Geometry = GeometryForm.representByCylinder(radius = 2.16795f, height = 2.09376f) //TODO hexahedron
ams.Name = "ams" ams.Name = "ams"
ams.MaxHealth = 5000 // Temporary - original value is 3000 ams.MaxHealth = 3000
ams.Damageable = true ams.Damageable = true
ams.Repairable = true ams.Repairable = true
ams.RepairIfDestroyed = false ams.RepairIfDestroyed = false
ams.MaxShields = 1000 // Temporary - original value is 600 + 1 ams.MaxShields = 600 + 1
ams.Seats += 0 -> new SeatDefinition() { ams.Seats += 0 -> new SeatDefinition() {
restriction = NoReinforcedOrMax restriction = NoReinforcedOrMax
} }
@ -6463,7 +6463,7 @@ object GlobalDefinitions {
ams.Packet = utilityConverter ams.Packet = utilityConverter
ams.DestroyedModel = Some(DestroyedVehicle.Ams) ams.DestroyedModel = Some(DestroyedVehicle.Ams)
ams.Subtract.Damage1 = 10 ams.Subtract.Damage1 = 10
ams.JackingDuration = Array(0, 60, 40, 30) // Temporary - original values are 0, 60, 20, 15 ams.JackingDuration = Array(0, 60, 20, 15)
ams.explodes = true ams.explodes = true
ams.innateDamage = new DamageWithPosition { ams.innateDamage = new DamageWithPosition {
CausesDamageType = DamageType.Splash CausesDamageType = DamageType.Splash
@ -7366,7 +7366,7 @@ object GlobalDefinitions {
val vterm = GeometryForm.representByCylinder(radius = 1.03515f, height = 1.09374f) _ val vterm = GeometryForm.representByCylinder(radius = 1.03515f, height = 1.09374f) _
ams_respawn_tube.Name = "ams_respawn_tube" ams_respawn_tube.Name = "ams_respawn_tube"
ams_respawn_tube.Delay = 10 // Temporary - Default value is 15 seconds ams_respawn_tube.Delay = 15
ams_respawn_tube.SpecificPointFunc = SpawnPoint.AMS ams_respawn_tube.SpecificPointFunc = SpawnPoint.AMS
ams_respawn_tube.Damageable = false ams_respawn_tube.Damageable = false
ams_respawn_tube.Repairable = false ams_respawn_tube.Repairable = false
@ -7612,7 +7612,7 @@ object GlobalDefinitions {
//TODO will need geometry when Damageable = true //TODO will need geometry when Damageable = true
respawn_tube_tower.Name = "respawn_tube_tower" respawn_tube_tower.Name = "respawn_tube_tower"
respawn_tube_tower.Delay = 10 // Temporary - Default value is 20 respawn_tube_tower.Delay = 20
respawn_tube_tower.SpecificPointFunc = SpawnPoint.Tube respawn_tube_tower.SpecificPointFunc = SpawnPoint.Tube
respawn_tube_tower.MaxHealth = 1000 respawn_tube_tower.MaxHealth = 1000
respawn_tube_tower.Damageable = true respawn_tube_tower.Damageable = true
@ -7840,7 +7840,7 @@ object GlobalDefinitions {
painbox.Damageable = false painbox.Damageable = false
painbox.Repairable = false painbox.Repairable = false
painbox.innateDamage = new DamageWithPosition { painbox.innateDamage = new DamageWithPosition {
Damage0 = 5 Damage0 = 2
DamageRadius = 0 DamageRadius = 0
DamageToHealthOnly = true DamageToHealthOnly = true
} }
@ -7850,7 +7850,7 @@ object GlobalDefinitions {
painbox_continuous.Damageable = false painbox_continuous.Damageable = false
painbox_continuous.Repairable = false painbox_continuous.Repairable = false
painbox_continuous.innateDamage = new DamageWithPosition { painbox_continuous.innateDamage = new DamageWithPosition {
Damage0 = 5 Damage0 = 2
DamageRadius = 0 DamageRadius = 0
DamageToHealthOnly = true DamageToHealthOnly = true
} }
@ -7862,7 +7862,7 @@ object GlobalDefinitions {
painbox_door_radius.Damageable = false painbox_door_radius.Damageable = false
painbox_door_radius.Repairable = false painbox_door_radius.Repairable = false
painbox_door_radius.innateDamage = new DamageWithPosition { painbox_door_radius.innateDamage = new DamageWithPosition {
Damage0 = 5 Damage0 = 2
DamageRadius = 10f * 0.6928f DamageRadius = 10f * 0.6928f
DamageToHealthOnly = true DamageToHealthOnly = true
} }
@ -7873,7 +7873,7 @@ object GlobalDefinitions {
painbox_door_radius_continuous.Damageable = false painbox_door_radius_continuous.Damageable = false
painbox_door_radius_continuous.Repairable = false painbox_door_radius_continuous.Repairable = false
painbox_door_radius_continuous.innateDamage = new DamageWithPosition { painbox_door_radius_continuous.innateDamage = new DamageWithPosition {
Damage0 = 5 Damage0 = 2
DamageRadius = 10f * 0.6928f DamageRadius = 10f * 0.6928f
DamageToHealthOnly = true DamageToHealthOnly = true
} }
@ -7884,7 +7884,7 @@ object GlobalDefinitions {
painbox_radius.Damageable = false painbox_radius.Damageable = false
painbox_radius.Repairable = false painbox_radius.Repairable = false
painbox_radius.innateDamage = new DamageWithPosition { painbox_radius.innateDamage = new DamageWithPosition {
Damage0 = 5 Damage0 = 2
DamageRadius = 10f * 0.6928f DamageRadius = 10f * 0.6928f
DamageToHealthOnly = true DamageToHealthOnly = true
} }
@ -7893,7 +7893,7 @@ object GlobalDefinitions {
painbox_radius_continuous.Damageable = false painbox_radius_continuous.Damageable = false
painbox_radius_continuous.Repairable = false painbox_radius_continuous.Repairable = false
painbox_radius_continuous.innateDamage = new DamageWithPosition { painbox_radius_continuous.innateDamage = new DamageWithPosition {
Damage0 = 5 Damage0 = 2
DamageRadius = 8.55f DamageRadius = 8.55f
DamageToHealthOnly = true DamageToHealthOnly = true
} }