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

Refactor "Target" -> "Threat"

Browse Source
This commit is contained in:
Daniel Lovell
2024-09-24 19:24:50 -07:00
parent 4293bfec94
commit 17af733afb
21 changed files with 112 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,10 +48,10 @@ public static class ConfigLoader {
PrintSwarmConfig(config.missile_swarm_configs[i], $"Missile Swarm {i + 1}");
}
Debug.Log("Target Swarm Configurations:");
Debug.Log("Threat Swarm Configurations:");
for (int i = 0; i < config.target_swarm_configs.Count; i++)
{
PrintSwarmConfig(config.target_swarm_configs[i], $"Target Swarm {i + 1}");
PrintSwarmConfig(config.target_swarm_configs[i], $"Threat Swarm {i + 1}");
}
}
@@ -66,7 +66,7 @@ public static class ConfigLoader {
{
Debug.Log(" Agent Configuration:");
Debug.Log($" Missile Type: {agentConfig.missile_type}");
Debug.Log($" Target Type: {agentConfig.target_type}");
Debug.Log($" Threat Type: {agentConfig.target_type}");
PrintInitialState(agentConfig.initial_state);
PrintStandardDeviation(agentConfig.standard_deviation);
PrintDynamicConfig(agentConfig.dynamic_config);

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

@@ -13,7 +13,7 @@ public class SimulationConfig {
[Header("Missile Swarm Configurations")]
public List<SwarmConfig> missile_swarm_configs = new List<SwarmConfig>();
[Header("Target Swarm Configurations")]
[Header("Threat Swarm Configurations")]
public List<SwarmConfig> target_swarm_configs = new List<SwarmConfig>();
}
@@ -32,7 +32,7 @@ public class SwarmConfig {
[Serializable]
public class AgentConfig {
public MissileType missile_type;
public TargetType target_type;
public ThreatType target_type;
public InitialState initial_state;
public StandardDeviation standard_deviation;
public DynamicConfig dynamic_config;
@@ -47,7 +47,7 @@ public class AgentConfig {
dynamic_config = submunitionConfig.dynamic_config,
plotting_config = submunitionConfig.plotting_config,
// Set other fields as needed, using default values if not present in SubmunitionAgentConfig
target_type = TargetType.DRONE, // Or another default value
target_type = ThreatType.DRONE, // Or another default value
submunitions_config = null // Or a default value if needed
};
}
@@ -102,7 +102,7 @@ public class SensorConfig {
[Serializable]
public class TargetConfig {
public TargetType target_type;
public ThreatType target_type;
public InitialState initial_state;
public PlottingConfig plotting_config;
public string prefabName;
@@ -112,7 +112,7 @@ public class TargetConfig {
[JsonConverter(typeof(StringEnumConverter))]
public enum MissileType { HYDRA_70, MICROMISSILE }
[JsonConverter(typeof(StringEnumConverter))]
public enum TargetType { DRONE, MISSILE }
public enum ThreatType { DRONE, MISSILE }
[JsonConverter(typeof(StringEnumConverter))]
public enum ConfigColor { BLUE, GREEN, RED }
[JsonConverter(typeof(StringEnumConverter))]