From f66ed5015d38cb5431737905f5c61ccf6047488b Mon Sep 17 00:00:00 2001 From: NickPSF <59997100+NickPSF@users.noreply.github.com> Date: Wed, 21 Apr 2021 14:46:41 -0500 Subject: [PATCH 1/7] Update game_objects0.adb.lst --- .../main/resources/overrides/game_objects0.adb.lst | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/server/src/main/resources/overrides/game_objects0.adb.lst b/server/src/main/resources/overrides/game_objects0.adb.lst index a44d9237..90604ee7 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 @@ -92,7 +91,7 @@ add_property six_shooter holstertime 500 add_property spiker equiptime 500 add_property spiker holstertime 500 add_property super_staminakit allowed true -add_property super_staminakit medkit_reuse_delay 300 +add_property super_staminakit medkit_reuse_delay 120 add_property super_staminakit nodrop false add_property super_staminakit requirement_award0 false add_property suppressor 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 From 0a3cf2c6d7cafa35894057e31704434c4f8943fa Mon Sep 17 00:00:00 2001 From: NickPSF <59997100+NickPSF@users.noreply.github.com> Date: Wed, 21 Apr 2021 15:08:31 -0500 Subject: [PATCH 2/7] Update GlobalDefinitions.scala --- src/main/scala/net/psforever/objects/GlobalDefinitions.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index a9080572..f2bd1b8d 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 From c27cace8135cae5400be282270355e6698295e62 Mon Sep 17 00:00:00 2001 From: NickPSF <59997100+NickPSF@users.noreply.github.com> Date: Wed, 21 Apr 2021 15:21:44 -0500 Subject: [PATCH 3/7] Update GlobalDefinitions.scala --- src/main/scala/net/psforever/objects/GlobalDefinitions.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index f2bd1b8d..e2c911f3 100644 --- a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -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 @@ -7590,7 +7590,7 @@ object GlobalDefinitions { bfr_terminal.Geometry = GeometryForm.representByCylinder(radius = 0.92185f, height = 2.64693f) respawn_tube.Name = "respawn_tube" - respawn_tube.Delay = 10 + respawn_tube.Delay = 5 // Temporary - Until Bio Lab Benefit, default value is 10 respawn_tube.SpecificPointFunc = SpawnPoint.Tube respawn_tube.MaxHealth = 1000 respawn_tube.Damageable = true From 499bd0392d136a530cf8e64c20dae729c0bb295f Mon Sep 17 00:00:00 2001 From: NickPSF <59997100+NickPSF@users.noreply.github.com> Date: Wed, 21 Apr 2021 15:22:59 -0500 Subject: [PATCH 4/7] Update GlobalDefinitions.scala --- src/main/scala/net/psforever/objects/GlobalDefinitions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index e2c911f3..7010d62d 100644 --- a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -7590,7 +7590,7 @@ object GlobalDefinitions { bfr_terminal.Geometry = GeometryForm.representByCylinder(radius = 0.92185f, height = 2.64693f) respawn_tube.Name = "respawn_tube" - respawn_tube.Delay = 5 // Temporary - Until Bio Lab Benefit, default value is 10 + respawn_tube.Delay = 10 respawn_tube.SpecificPointFunc = SpawnPoint.Tube respawn_tube.MaxHealth = 1000 respawn_tube.Damageable = true From 1f711feda4bf09e2bde22e72e93b1e03a9ade8bf Mon Sep 17 00:00:00 2001 From: NickPSF <59997100+NickPSF@users.noreply.github.com> Date: Wed, 21 Apr 2021 17:30:34 -0500 Subject: [PATCH 5/7] Update GlobalDefinitions.scala --- src/main/scala/net/psforever/objects/GlobalDefinitions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index 7010d62d..08f5651a 100644 --- a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -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 From a2231d70d3998cd278732640dc815551245cfa4d Mon Sep 17 00:00:00 2001 From: NickPSF <59997100+NickPSF@users.noreply.github.com> Date: Wed, 21 Apr 2021 17:35:52 -0500 Subject: [PATCH 6/7] Update game_objects0.adb.lst --- server/src/main/resources/overrides/game_objects0.adb.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/resources/overrides/game_objects0.adb.lst b/server/src/main/resources/overrides/game_objects0.adb.lst index 90604ee7..417c8994 100644 --- a/server/src/main/resources/overrides/game_objects0.adb.lst +++ b/server/src/main/resources/overrides/game_objects0.adb.lst @@ -91,7 +91,7 @@ add_property six_shooter holstertime 500 add_property spiker equiptime 500 add_property spiker holstertime 500 add_property super_staminakit allowed true -add_property super_staminakit medkit_reuse_delay 120 +add_property super_staminakit medkit_reuse_delay 300 add_property super_staminakit nodrop false add_property super_staminakit requirement_award0 false add_property suppressor equiptime 600 From 5d84c85687120fab2c0c18a2d624125e3146becb Mon Sep 17 00:00:00 2001 From: NickPSF <59997100+NickPSF@users.noreply.github.com> Date: Wed, 21 Apr 2021 18:07:19 -0500 Subject: [PATCH 7/7] Update Avatar.scala --- src/main/scala/net/psforever/objects/avatar/Avatar.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ) }