diff --git a/server/src/main/resources/overrides/game_objects0.adb.lst b/server/src/main/resources/overrides/game_objects0.adb.lst index a44d9237..417c8994 100644 --- a/server/src/main/resources/overrides/game_objects0.adb.lst +++ b/server/src/main/resources/overrides/game_objects0.adb.lst @@ -1,7 +1,5 @@ -add_property ace allowed true add_property ace equiptime 500 add_property ace holstertime 500 -add_property ace_deployable allowed true add_property ace_deployable equiptime 500 add_property ace_deployable holstertime 500 add_property advanced_ace equiptime 750 @@ -46,8 +44,6 @@ add_property flechette equiptime 600 add_property flechette holstertime 600 add_property forceblade equiptime 250 add_property forceblade holstertime 250 -add_property galaxy_gunship allowed false -add_property galaxy_gunship maxhealth 9500 add_property gauss equiptime 600 add_property gauss holstertime 600 add_property ilc9 equiptime 500 @@ -58,10 +54,9 @@ add_property katana equiptime 250 add_property katana holstertime 250 add_property lasher equiptime 750 add_property lasher holstertime 750 -add_property lasher_projectile lash_delay 0.00 -add_property lasher_projectile_ap lash_delay 0.00 add_property lasher_projectile_ap lasher_projectile_ap false add_property lasher_projectile_ap lasher_projectile true +add_property lightgunship maxhealth 855 add_property maelstrom equiptime 1000 add_property maelstrom holstertime 1000 add_property magcutter equiptime 250 @@ -77,6 +72,10 @@ add_property nano_dispenser holstertime 750 add_property pellet_gun equiptime 600 add_property pellet_gun holstertime 600 add_property peregrine_flight requirement_award0 false +add_property portable_manned_turret odf_buildings true +add_property portable_manned_turret odf_soi_enemy true +add_property portable_manned_turret odf_soi_friendly true +add_property portable_manned_turret odf_walls true add_property pulsar equiptime 600 add_property pulsar holstertime 600 add_property punisher equiptime 600 @@ -100,4 +99,3 @@ add_property suppressor holstertime 600 add_property trek equiptime 500 add_property trek holstertime 500 add_property vulture requirement_award0 false -add_property ams requirement_certification0 vehicles diff --git a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index a9080572..08f5651a 100644 --- a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -6624,11 +6624,11 @@ object GlobalDefinitions { mosquito.Geometry = GeometryForm.representByCylinder(radius = 2.72108f, height = 2.5f) lightgunship.Name = "lightgunship" // Reaver - lightgunship.MaxHealth = 1000 + lightgunship.MaxHealth = 855 // Temporary - Correct Reaver Health from pre-"Coder Madness 2" Event lightgunship.Damageable = true lightgunship.Repairable = true lightgunship.RepairIfDestroyed = false - lightgunship.MaxShields = 200 + lightgunship.MaxShields = 171 // Temporary - Correct Reaver Shields from pre-"Coder Madness 2" Event lightgunship.CanFly = true lightgunship.Seats += 0 -> bailableSeat lightgunship.controlledWeapons += 0 -> 1 @@ -7366,7 +7366,7 @@ object GlobalDefinitions { val vterm = GeometryForm.representByCylinder(radius = 1.03515f, height = 1.09374f) _ ams_respawn_tube.Name = "ams_respawn_tube" - ams_respawn_tube.Delay = 10 + ams_respawn_tube.Delay = 10 // Temporary - Default value is 15 seconds ams_respawn_tube.SpecificPointFunc = SpawnPoint.AMS ams_respawn_tube.Damageable = false ams_respawn_tube.Repairable = false @@ -7612,7 +7612,7 @@ object GlobalDefinitions { //TODO will need geometry when Damageable = true respawn_tube_tower.Name = "respawn_tube_tower" - respawn_tube_tower.Delay = 10 + respawn_tube_tower.Delay = 10 // Temporary - Default value is 20 respawn_tube_tower.SpecificPointFunc = SpawnPoint.Tube respawn_tube_tower.MaxHealth = 1000 respawn_tube_tower.Damageable = true diff --git a/src/main/scala/net/psforever/objects/avatar/Avatar.scala b/src/main/scala/net/psforever/objects/avatar/Avatar.scala index 9433f93b..ba3beb1d 100644 --- a/src/main/scala/net/psforever/objects/avatar/Avatar.scala +++ b/src/main/scala/net/psforever/objects/avatar/Avatar.scala @@ -24,7 +24,7 @@ object Avatar { GlobalDefinitions.dropship -> 5.minutes, GlobalDefinitions.flail -> 5.minutes, GlobalDefinitions.fury -> 5.minutes, - GlobalDefinitions.galaxy_gunship -> 10.minutes, + GlobalDefinitions.galaxy_gunship -> 15.minutes, //Temporary - Default is 10 minutes GlobalDefinitions.lodestar -> 5.minutes, GlobalDefinitions.liberator -> 5.minutes, GlobalDefinitions.lightgunship -> 5.minutes, @@ -63,7 +63,7 @@ object Avatar { GlobalDefinitions.medkit -> 5.seconds, GlobalDefinitions.super_armorkit -> 20.minutes, GlobalDefinitions.super_medkit -> 20.minutes, - GlobalDefinitions.super_staminakit -> 20.minutes + GlobalDefinitions.super_staminakit -> 5.minutes // Temporary - Default value is 20 minutes ) }