start on new threat types & strategy abstraction

Assets/Scripts/Config/SimulationConfig.cs

@@ -4,115 +4,121 @@ using UnityEngine;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-
 [Serializable]
 public class SimulationConfig {
-    [Header("Simulation Settings")]
-    public float timeScale = 0.05f;
+  [Header("Simulation Settings")]
+  public float timeScale = 0.05f;
 
-    [Header("Interceptor Swarm Configurations")]
-    public List<SwarmConfig> interceptor_swarm_configs = new List<SwarmConfig>();
+  // [Header("Defense Points")]
+  // public SwarmConfig defense_points_config;
 
-    [Header("Threat Swarm Configurations")]
-    public List<SwarmConfig> threat_swarm_configs = new List<SwarmConfig>();
+  [Header("Interceptor Swarm Configurations")]
+  public List<SwarmConfig> interceptor_swarm_configs = new List<SwarmConfig>();
+
+  [Header("Threat Swarm Configurations")]
+  public List<SwarmConfig> threat_swarm_configs = new List<SwarmConfig>();
 }
 
 [Serializable]
 public class DynamicConfig {
-    public LaunchConfig launch_config;
-    public SensorConfig sensor_config;
+  public LaunchConfig launch_config;
+  public SensorConfig sensor_config;
 }
 
- [Serializable]
+[Serializable]
 public class SwarmConfig {
-    public int num_agents;
-    public AgentConfig agent_config;
+  public int num_agents;
+  public AgentConfig agent_config;
 }
 
 [Serializable]
 public class AgentConfig {
-    public InterceptorType interceptor_type;
-    public ThreatType threat_type;
-    public InitialState initial_state;
-    public StandardDeviation standard_deviation;
-    public DynamicConfig dynamic_config;
-    public PlottingConfig plotting_config;
-    public SubmunitionsConfig submunitions_config;
+  public InterceptorType interceptor_type;
+  public ThreatType threat_type;
+  public InitialState initial_state;
+  public StandardDeviation standard_deviation;
+  public DynamicConfig dynamic_config;
+  public PlottingConfig plotting_config;
+  public SubmunitionsConfig submunitions_config;
 
-    public static AgentConfig FromSubmunitionAgentConfig(SubmunitionAgentConfig submunitionConfig) {
-        return new AgentConfig {
-            interceptor_type = submunitionConfig.interceptor_type,
-            initial_state = submunitionConfig.initial_state,
-            standard_deviation = submunitionConfig.standard_deviation,
-            dynamic_config = submunitionConfig.dynamic_config,
-            plotting_config = submunitionConfig.plotting_config,
-            // Set other fields as needed, using default values if not present in SubmunitionAgentConfig
-            threat_type = ThreatType.DRONE,  // Or another default value
-            submunitions_config = null       // Or a default value if needed
-        };
-    }
+  public static AgentConfig FromSubmunitionAgentConfig(SubmunitionAgentConfig submunitionConfig) {
+    return new AgentConfig {
+      interceptor_type = submunitionConfig.interceptor_type,
+      initial_state = submunitionConfig.initial_state,
+      standard_deviation = submunitionConfig.standard_deviation,
+      dynamic_config = submunitionConfig.dynamic_config,
+      plotting_config = submunitionConfig.plotting_config,
+      // Set other fields as needed, using default values if not present in SubmunitionAgentConfig
+      threat_type = ThreatType.DRONE,  // Or another default value
+      submunitions_config = null       // Or a default value if needed
+    };
+  }
 }
 
 [Serializable]
 public class InitialState {
-    public Vector3 position;
-    public Vector3 rotation;
-    public Vector3 velocity;
+  public Vector3 position;
+  public Vector3 rotation;
+  public Vector3 velocity;
 }
 
 [Serializable]
 public class StandardDeviation {
-    public Vector3 position;
-    public Vector3 velocity;
+  public Vector3 position;
+  public Vector3 velocity;
 }
 
-[Serializable]  
+[Serializable]
 public class LaunchConfig {
-    public float launch_time;
+  public float launch_time;
 }
 
 [Serializable]
 public class PlottingConfig {
-    public ConfigColor color;
-    public LineStyle linestyle;
-    public Marker marker;
+  public ConfigColor color;
+  public LineStyle linestyle;
+  public Marker marker;
 }
 
 [Serializable]
 public class SubmunitionsConfig {
-    public int num_submunitions;
-    public LaunchConfig launch_config;
-    public SubmunitionAgentConfig agent_config;
+  public int num_submunitions;
+  public LaunchConfig launch_config;
+  public SubmunitionAgentConfig agent_config;
 }
 
 [Serializable]
 public class SubmunitionAgentConfig {
-    public InterceptorType interceptor_type;
-    public InitialState initial_state;
-    public StandardDeviation standard_deviation;
-    public DynamicConfig dynamic_config;
-    public PlottingConfig plotting_config;
+  public InterceptorType interceptor_type;
+  public InitialState initial_state;
+  public StandardDeviation standard_deviation;
+  public DynamicConfig dynamic_config;
+  public PlottingConfig plotting_config;
 }
 
 [Serializable]
 public class SensorConfig {
-    public SensorType type;
-    public float frequency;
+  public SensorType type;
+  public float frequency;
 }
 
 [Serializable]
 public class TargetConfig {
-    public ThreatType threat_type;
-    public InitialState initial_state;
-    public PlottingConfig plotting_config;
-    public string prefabName;
+  public ThreatType threat_type;
+  public InitialState initial_state;
+  public PlottingConfig plotting_config;
+  public string prefabName;
 }
 
 // Enums
 [JsonConverter(typeof(StringEnumConverter))]
 public enum InterceptorType { HYDRA_70, MICROMISSILE }
 [JsonConverter(typeof(StringEnumConverter))]
-public enum ThreatType { DRONE, MISSILE }
+public enum ThreatType {
+  DRONE,
+  FIXED_WING_MISSILE,
+  ROLL_STABILIZED_MISSILE
+}  // Add ballistic later -michael
 [JsonConverter(typeof(StringEnumConverter))]
 public enum ConfigColor { BLUE, GREEN, RED }
 [JsonConverter(typeof(StringEnumConverter))]