From bcdc4fd11f63561533fb7e4f9644c3d33d51ee1d Mon Sep 17 00:00:00 2001
From: NickPSF <59997100+NickPSF@users.noreply.github.com>
Date: Tue, 14 Jul 2020 20:44:15 +0200
Subject: [PATCH] Temporary AMS & GG changes based on community needs.

**AMS Changes:**

- Max health increased from 3000 to 5000
- Max shields increased from 600 + 1 to 1000 + 1
- Expert Hacker jacking time increased from 15 to 30 seconds
- Advanced Hacker jacking time increased from 20 to 40 seconds

**Galaxy Gunship Changes:**

- Max health increased from 6000 to 9500 while it lacks its damage reduction mechanic.
---
 .../scala/net/psforever/objects/GlobalDefinitions.scala   | 8 ++++----
 .../src/main/resources/overrides/game_objects0.adb.lst    | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala
index 0ec8f3212..964c62155 100644
--- a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala
+++ b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala
@@ -5826,11 +5826,11 @@ object GlobalDefinitions {
     ant.JackingDuration = Array(0, 60, 20, 15)
 
     ams.Name = "ams"
-    ams.MaxHealth = 3000
+    ams.MaxHealth = 5000 // Temporary - original value is 3000
     ams.Damageable = true
     ams.Repairable = true
     ams.RepairIfDestroyed = false
-    ams.MaxShields = 600 + 1
+    ams.MaxShields = 1000 + 1 // Temporary - original value is 600 + 1
     ams.Seats += 0 -> new SeatDefinition()
     ams.Seats(0).ArmorRestriction = SeatArmorRestriction.NoReinforcedOrMax
     ams.MountPoints += 1 -> 0
@@ -5847,7 +5847,7 @@ object GlobalDefinitions {
     ams.Packet = utilityConverter
     ams.DestroyedModel = Some(DestroyedVehicle.Ams)
     ams.Subtract.Damage1 = 10
-    ams.JackingDuration = Array(0, 60, 20, 15)
+    ams.JackingDuration = Array(0, 60, 40, 30) // Temporary - original values are 0, 60, 20, 15
 
     val variantConverter = new VariantVehicleConverter
     router.Name = "router"
@@ -6105,7 +6105,7 @@ object GlobalDefinitions {
     dropship.JackingDuration = Array(0, 60, 20, 10)
 
     galaxy_gunship.Name = "galaxy_gunship"
-    galaxy_gunship.MaxHealth = 6000
+    galaxy_gunship.MaxHealth = 9500 //Temporary - original value is 6000
     galaxy_gunship.Damageable = true
     galaxy_gunship.Repairable = true
     galaxy_gunship.RepairDistance = 20
diff --git a/pslogin/src/main/resources/overrides/game_objects0.adb.lst b/pslogin/src/main/resources/overrides/game_objects0.adb.lst
index 06b76c314..581c40311 100644
--- a/pslogin/src/main/resources/overrides/game_objects0.adb.lst
+++ b/pslogin/src/main/resources/overrides/game_objects0.adb.lst
@@ -6,6 +6,8 @@ add_property ace_deployable equiptime 500
 add_property ace_deployable holstertime 500
 add_property advanced_ace equiptime 750
 add_property advanced_ace holstertime 750
+add_property ams maxhealth 5000
+add_property ams jacking_duration 0 60 40 30
 add_property anniversary_gun equiptime 500
 add_property anniversary_gun holstertime 500
 add_property anniversary_guna equiptime 500
@@ -44,6 +46,7 @@ add_property flechette equiptime 600
 add_property flechette holstertime 600
 add_property forceblade equiptime 250
 add_property forceblade holstertime 250
+add_property galaxy_gunship maxhealth 9500
 add_property gauss equiptime 600
 add_property gauss holstertime 600
 add_property ilc9 equiptime 500