turtlebasket/micromissiles-unity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor "Missile" -> "Interceptor"

Browse Source
This commit is contained in:
Daniel Lovell
2024-09-24 19:59:25 -07:00
parent bbb2dba1ed
commit a29efbb4ca
23 changed files with 155 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Scripts/Config/ConfigLoader.cs
View File

@@ -42,16 +42,16 @@ public static class ConfigLoader {
Debug.Log("SimulationConfig:");
Debug.Log($"Time Scale: {config.timeScale}");
Debug.Log("Missile Swarm Configurations:");
for (int i = 0; i < config.missile_swarm_configs.Count; i++)
Debug.Log("Interceptor Swarm Configurations:");
for (int i = 0; i < config.interceptor_swarm_configs.Count; i++)
{
PrintSwarmConfig(config.missile_swarm_configs[i], $"Missile Swarm {i + 1}");
PrintSwarmConfig(config.interceptor_swarm_configs[i], $"Interceptor Swarm {i + 1}");
}
Debug.Log("Threat Swarm Configurations:");
for (int i = 0; i < config.target_swarm_configs.Count; i++)
for (int i = 0; i < config.threat_swarm_configs.Count; i++)
{
PrintSwarmConfig(config.target_swarm_configs[i], $"Threat Swarm {i + 1}");
PrintSwarmConfig(config.threat_swarm_configs[i], $"Threat Swarm {i + 1}");
}
}
@@ -65,7 +65,7 @@ public static class ConfigLoader {
private static void PrintAgentConfig(AgentConfig agentConfig)
{
Debug.Log(" Agent Configuration:");
Debug.Log($" Missile Type: {agentConfig.missile_type}");
Debug.Log($" Interceptor Type: {agentConfig.interceptor_type}");
Debug.Log($" Threat Type: {agentConfig.target_type}");
PrintInitialState(agentConfig.initial_state);
PrintStandardDeviation(agentConfig.standard_deviation);
@@ -122,7 +122,7 @@ public static class ConfigLoader {
private static void PrintSubmunitionAgentConfig(SubmunitionAgentConfig agentConfig)
{
Debug.Log(" Submunition Agent Configuration:");
Debug.Log($" Missile Type: {agentConfig.missile_type}");
Debug.Log($" Interceptor Type: {agentConfig.interceptor_type}");
PrintInitialState(agentConfig.initial_state);
PrintStandardDeviation(agentConfig.standard_deviation);
PrintDynamicConfig(agentConfig.dynamic_config);

16
Assets/Scripts/Config/SimulationConfig.cs
View File

@@ -10,11 +10,11 @@ public class SimulationConfig {
[Header("Simulation Settings")]
public float timeScale = 0.05f;
[Header("Missile Swarm Configurations")]
public List<SwarmConfig> missile_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> target_swarm_configs = new List<SwarmConfig>();
public List<SwarmConfig> threat_swarm_configs = new List<SwarmConfig>();
}
[Serializable]
@@ -31,7 +31,7 @@ public class SwarmConfig {
[Serializable]
public class AgentConfig {
public MissileType missile_type;
public InterceptorType interceptor_type;
public ThreatType target_type;
public InitialState initial_state;
public StandardDeviation standard_deviation;
@@ -41,7 +41,7 @@ public class AgentConfig {
public static AgentConfig FromSubmunitionAgentConfig(SubmunitionAgentConfig submunitionConfig) {
return new AgentConfig {
missile_type = submunitionConfig.missile_type,
interceptor_type = submunitionConfig.interceptor_type,
initial_state = submunitionConfig.initial_state,
standard_deviation = submunitionConfig.standard_deviation,
dynamic_config = submunitionConfig.dynamic_config,
@@ -87,7 +87,7 @@ public class SubmunitionsConfig {
[Serializable]
public class SubmunitionAgentConfig {
public MissileType missile_type;
public InterceptorType interceptor_type;
public InitialState initial_state;
public StandardDeviation standard_deviation;
public DynamicConfig dynamic_config;
@@ -110,9 +110,9 @@ public class TargetConfig {
// Enums
[JsonConverter(typeof(StringEnumConverter))]
public enum MissileType { HYDRA_70, MICROMISSILE }
public enum InterceptorType { HYDRA_70, MICROMISSILE }
[JsonConverter(typeof(StringEnumConverter))]
public enum ThreatType { DRONE, MISSILE }
public enum ThreatType { DRONE, ANTISHIP_MISSILE }
[JsonConverter(typeof(StringEnumConverter))]
public enum ConfigColor { BLUE, GREEN, RED }
[JsonConverter(typeof(StringEnumConverter))]