From 99a946363cbbb4d04ff683510f8909a8816f4816 Mon Sep 17 00:00:00 2001 From: Roy Falk Date: Fri, 7 Feb 2025 10:00:17 +0200 Subject: [PATCH] Support engine change to Radar component Fix too large radar range. Damage Llama.begin, both for testing and for gameplay in general. --- units/ships.json | 4 +- units/units.json | 281 +++++++++++++++++++++++++---------------------- 2 files changed, 149 insertions(+), 136 deletions(-) diff --git a/units/ships.json b/units/ships.json index a19229b1..bce68286 100644 --- a/units/ships.json +++ b/units/ships.json @@ -77,7 +77,7 @@ "Key": "eject.template", "ITTS": "1", "Radar_Color": "1", - "Radar_Range": "30000000000", + "Radar_Range": "3000000000", "Tracking_Cone": "180", "Max_Cone": "180", "Lock_Cone": "180", @@ -6188,7 +6188,7 @@ "Reactor_Recharge": "44", "Outsystem_Jump_Cost": "200", "Default_Speed_Governor": "120/125", - "Radar_Range": "300000000", + "Radar_Range": "125000000/300000000", "Tracking_Cone": "4", "Max_Cone": "180", "Lock_Cone": "25", diff --git a/units/units.json b/units/units.json index 4c464d49..1a31e0a7 100644 --- a/units/units.json +++ b/units/units.json @@ -836,6 +836,149 @@ "Afterburner_Accel": "2.3", "Afterburner_Speed_Governor": "2.1" }, + { + "Key": "skyscope1__upgrades", + "Name": "SkyScope Alpha", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "Radar_Range": "30000000", + "Tracking_Cone": "4", + "Max_Cone": "180", + "Lock_Cone": "25", + "Textual_Description": "\"@upgrades/skyscope_alpha.png@\"\n" + }, + { + "Key": "skyscope2__upgrades", + "Name": "SkyScope Alpha Plus", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "Radar_Range": "60000000", + "Tracking_Cone": "5", + "Max_Cone": "180", + "Lock_Cone": "30", + "Textual_Description": "\"@upgrades/skyscope_alphaplus.png@\"\n" + }, + { + "Key": "skyscope3__upgrades", + "Name": "SkyScope Beta", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "ITTS": "1", + "Radar_Range": "120000000", + "Tracking_Cone": "8", + "Max_Cone": "180", + "Lock_Cone": "35", + "Textual_Description": "\"@upgrades/skyscope_beta.png@\"\n" + }, + { + "Key": "starscanner1__upgrades", + "Name": "StarScanner 2530", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "Radar_Color": "1", + "Radar_Range": "48000000", + "Tracking_Cone": "3", + "Max_Cone": "180", + "Lock_Cone": "40", + "Textual_Description": "\"@upgrades/starscanner_2530.png@\"\n" + }, + { + "Key": "starscanner2__upgrades", + "Name": "StarScanner 2545", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "Radar_Color": "1", + "Radar_Range": "84000000", + "Tracking_Cone": "6", + "Max_Cone": "180", + "Lock_Cone": "42", + "Textual_Description": "\"@upgrades/starscanner_2545.png@\"\n" + }, + { + "Key": "starscanner3__upgrades", + "Name": "StarScanner 2600", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "ITTS": "1", + "Radar_Color": "1", + "Radar_Range": "120000000", + "Tracking_Cone": "10", + "Max_Cone": "180", + "Lock_Cone": "45", + "Textual_Description": "\"@upgrades/starscanner_2600.png@\"\n" + }, + { + "Key": "starscanner4__upgrades", + "Name": "StarScanner 2610", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "ITTS": "1", + "Radar_Color": "THREAT", + "Radar_Range": "120000000", + "Tracking_Cone": "10", + "Max_Cone": "180", + "Lock_Cone": "45" + }, + { + "Key": "hawkeye1__upgrades", + "Name": "Hawkeye ZX-16", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "ITTS": "1", + "Radar_Range": "84000000", + "Tracking_Cone": "6", + "Max_Cone": "180", + "Lock_Cone": "30", + "Textual_Description": "\"@upgrades/hawkeye_zx16.png@\"\n" + }, + { + "Key": "hawkeye2__upgrades", + "Name": "Hawkeye ZX-50", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "ITTS": "1", + "Radar_Range": "240000000", + "Tracking_Cone": "7", + "Max_Cone": "180", + "Lock_Cone": "40", + "Textual_Description": "\"@upgrades/hawkeye_zx50.png@\"\n" + }, + { + "Key": "hawkeye3__upgrades", + "Name": "Hawkeye ZX-86", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "ITTS": "1", + "Radar_Color": "1", + "Radar_Range": "300000000", + "Tracking_Cone": "9", + "Max_Cone": "180", + "Lock_Cone": "45", + "Textual_Description": "\"@upgrades/hawkeye_zx86.png@\"\n" + }, + { + "Key": "hawkeye4__upgrades", + "Name": "Hawkeye ZX-87", + "Upgrade_Type": "Radar", + "Object_Type": "Upgrade_Replacement", + "Mass": "0.5", + "ITTS": "1", + "Radar_Color": "THREAT", + "Radar_Range": "300000000", + "Tracking_Cone": "9", + "Max_Cone": "180", + "Lock_Cone": "45" + }, { "Key": "Admonisher_Milspec_Package__upgrades", "Name": "Admonisher_Milspec_Package", @@ -3388,7 +3531,7 @@ "Hull": "1000000000000000", "ITTS": "1", "Radar_Color": "1", - "Radar_Range": "30000000000", + "Radar_Range": "3000000000", "Tracking_Cone": "180", "Max_Cone": "180", "Lock_Cone": "180", @@ -7732,7 +7875,7 @@ "Pitch_Governor": "124.2", "ITTS": "1", "Radar_Color": "1", - "Radar_Range": "3000000000", + "Radar_Range": "300000000", "Tracking_Cone": "5", "Max_Cone": "180", "Lock_Cone": "90", @@ -11579,55 +11722,7 @@ "Ecm_Drain": "12", "Textual_Description": "\"@upgrades/ecm3.png@Electronic CounterMeasures\\ ECM refers to a broad spectrum of techniques designed to defeat or spoof enemy sensors and communications.\"\n" }, - { - "Key": "hawkeye1__upgrades", - "Name": "Hawkeye ZX-16", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "ITTS": "1", - "Radar_Range": "84000000", - "Tracking_Cone": "6", - "Max_Cone": "180", - "Lock_Cone": "30", - "Textual_Description": "\"@upgrades/hawkeye_zx16.png@\"\n" - }, - { - "Key": "hawkeye2__upgrades", - "Name": "Hawkeye ZX-50", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "ITTS": "1", - "Radar_Range": "240000000", - "Tracking_Cone": "7", - "Max_Cone": "180", - "Lock_Cone": "40", - "Textual_Description": "\"@upgrades/hawkeye_zx50.png@\"\n" - }, - { - "Key": "hawkeye3__upgrades", - "Name": "Hawkeye ZX-86", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "ITTS": "1", - "Radar_Color": "1", - "Radar_Range": "300000000", - "Tracking_Cone": "9", - "Max_Cone": "180", - "Lock_Cone": "45", - "Textual_Description": "\"@upgrades/hawkeye_zx86.png@\"\n" - }, - { - "Key": "hawkeye4__upgrades", - "Name": "Hawkeye ZX-87", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "ITTS": "1", - "Radar_Color": "THREAT", - "Radar_Range": "300000000", - "Tracking_Cone": "9", - "Max_Cone": "180", - "Lock_Cone": "45" - }, + { "Key": "passenger_quarters_01__upgrades", "Name": "Cryochamber", @@ -11696,89 +11791,7 @@ "Mass": "1", "Repair_Droid": "5" }, - { - "Key": "skyscope1__upgrades", - "Name": "SkyScope Alpha", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "Radar_Range": "30000000", - "Tracking_Cone": "4", - "Max_Cone": "180", - "Lock_Cone": "25", - "Textual_Description": "\"@upgrades/skyscope_alpha.png@\"\n" - }, - { - "Key": "skyscope2__upgrades", - "Name": "SkyScope Alpha Plus", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "Radar_Range": "60000000", - "Tracking_Cone": "5", - "Max_Cone": "180", - "Lock_Cone": "30", - "Textual_Description": "\"@upgrades/skyscope_alphaplus.png@\"\n" - }, - { - "Key": "skyscope3__upgrades", - "Name": "SkyScope Beta", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "ITTS": "1", - "Radar_Range": "120000000", - "Tracking_Cone": "8", - "Max_Cone": "180", - "Lock_Cone": "35", - "Textual_Description": "\"@upgrades/skyscope_beta.png@\"\n" - }, - { - "Key": "starscanner1__upgrades", - "Name": "StarScanner 2530", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "Radar_Color": "1", - "Radar_Range": "48000000", - "Tracking_Cone": "3", - "Max_Cone": "180", - "Lock_Cone": "40", - "Textual_Description": "\"@upgrades/starscanner_2530.png@\"\n" - }, - { - "Key": "starscanner2__upgrades", - "Name": "StarScanner 2545", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "Radar_Color": "1", - "Radar_Range": "84000000", - "Tracking_Cone": "6", - "Max_Cone": "180", - "Lock_Cone": "42", - "Textual_Description": "\"@upgrades/starscanner_2545.png@\"\n" - }, - { - "Key": "starscanner3__upgrades", - "Name": "StarScanner 2600", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "ITTS": "1", - "Radar_Color": "1", - "Radar_Range": "120000000", - "Tracking_Cone": "10", - "Max_Cone": "180", - "Lock_Cone": "45", - "Textual_Description": "\"@upgrades/starscanner_2600.png@\"\n" - }, - { - "Key": "starscanner4__upgrades", - "Name": "StarScanner 2610", - "Object_Type": "Upgrade_Replacement", - "Mass": "0.5", - "ITTS": "1", - "Radar_Color": "THREAT", - "Radar_Range": "120000000", - "Tracking_Cone": "10", - "Max_Cone": "180", - "Lock_Cone": "45" - }, + { "Key": "surveyor1__upgrades", "Name": "SpaceSurveyor H1",