Doctrine cleanup (#3318)

This PR:

- Refactors the doctrine class to have a bit more structure, in
anticipation of adding more elements to Doctrine.
- Moves previously hard coded helo-specific altitudes into the Doctrine
class, aligning a bunch of altitudes ~200ft in the process.
- Refactors ingress_altitude to combat_altitude to clarify that the
altitude is applied to multiple waypoint types, not just the ingress
altitude.

resources/doctrines/coldwar.yaml

@@ -1,27 +1,24 @@
 name: coldwar
-cap: true
-cas: true
-sead: true
-strike: true
-antiship: true
-rendezvous_altitude_ft_msl: 22000
 hold_distance_nm: 15
 push_distance_nm: 10
 join_distance_nm: 10
 max_ingress_distance_nm: 30
 min_ingress_distance_nm: 10
-ingress_altitude_ft_msl: 18000
-min_patrol_altitude_ft_msl: 10000
-max_patrol_altitude_ft_msl: 24000
-pattern_altitude_ft_msl: 5000
-cap_duration_minutes: 30
-cap_min_track_length_nm: 12
-cap_max_track_length_nm: 24
-cap_min_distance_from_cp_nm: 8
-cap_max_distance_from_cp_nm: 25
-cap_engagement_range_nm: 35
-cas_duration_minutes: 30
-sweep_distance_nm: 40
+rendezvous_altitude_ft_msl: 22000
+combat_altitude_ft_msl: 18000
+cap:
+  duration_minutes: 30
+  min_track_length_nm: 12
+  max_track_length_nm: 24
+  min_distance_from_cp_nm: 8
+  max_distance_from_cp_nm: 25
+  engagement_range_nm: 35
+  min_patrol_altitude_ft_msl: 10000
+  max_patrol_altitude_ft_msl: 24000
+cas:
+  duration_minutes: 30
+sweep:
+  distance_nm: 40
 ground_unit_procurement_ratios:
     Tank: 4
     ATGM: 2
@@ -30,3 +27,8 @@ ground_unit_procurement_ratios:
     Artillery: 1
     SHORAD: 2
     Recon: 1
+helicopter:
+    combat_altitude_ft_agl: 200
+    rendezvous_altitude_ft_agl: 1500
+    air_assault_nav_altitude_ft_agl: 1500
+

resources/doctrines/modern.yaml

@@ -1,27 +1,24 @@
 name: modern
-cap: true
-cas: true
-sead: true
-strike: true
-antiship: true
-rendezvous_altitude_ft_msl: 25000
 hold_distance_nm: 25
 push_distance_nm: 20
 join_distance_nm: 20
 max_ingress_distance_nm: 45
 min_ingress_distance_nm: 10
-ingress_altitude_ft_msl: 20000
-min_patrol_altitude_ft_msl: 15000
-max_patrol_altitude_ft_msl: 33000
-pattern_altitude_ft_msl: 5000
-cap_duration_minutes: 30
-cap_min_track_length_nm: 15
-cap_max_track_length_nm: 40
-cap_min_distance_from_cp_nm: 10
-cap_max_distance_from_cp_nm: 40
-cap_engagement_range_nm: 50
-cas_duration_minutes: 30
-sweep_distance_nm: 60
+rendezvous_altitude_ft_msl: 25000
+combat_altitude_ft_msl: 20000
+cap:
+  duration_minutes: 30
+  min_track_length_nm: 15
+  max_track_length_nm: 40
+  min_distance_from_cp_nm: 10
+  max_distance_from_cp_nm: 40
+  engagement_range_nm: 50
+  min_patrol_altitude_ft_msl: 15000
+  max_patrol_altitude_ft_msl: 33000
+cas:
+  duration_minutes: 30
+sweep:
+  distance_nm: 60
 ground_unit_procurement_ratios:    
     Tank: 3
     ATGM: 2
@@ -30,3 +27,7 @@ ground_unit_procurement_ratios:
     Artillery: 1
     SHORAD: 2
     Recon: 1
+helicopter:
+    combat_altitude_ft_agl: 200
+    rendezvous_altitude_ft_agl: 1500
+    air_assault_nav_altitude_ft_agl: 1500

resources/doctrines/ww2.yaml

@@ -1,27 +1,24 @@
 name: ww2
-cap: true
-cas: true
-sead: false
-strike: true
-antiship: true
 hold_distance_nm: 10
 push_distance_nm: 5
 join_distance_nm: 5
-rendezvous_altitude_ft_msl: 10000
 max_ingress_distance_nm: 7
 min_ingress_distance_nm: 5
-ingress_altitude_ft_msl: 8000
-min_patrol_altitude_ft_msl: 4000
-max_patrol_altitude_ft_msl: 15000
-pattern_altitude_ft_msl: 5000
-cap_duration_minutes: 30
-cap_min_track_length_nm: 8
-cap_max_track_length_nm: 18
-cap_min_distance_from_cp_nm: 0
-cap_max_distance_from_cp_nm: 5
-cap_engagement_range_nm: 20
-cas_duration_minutes: 30
-sweep_distance_nm: 10
+rendezvous_altitude_ft_msl: 10000
+combat_altitude_ft_msl: 8000
+cap:
+  duration_minutes: 30
+  min_track_length_nm: 8
+  max_track_length_nm: 18
+  min_distance_from_cp_nm: 0
+  max_distance_from_cp_nm: 5
+  engagement_range_nm: 20
+  min_patrol_altitude_ft_msl: 4000
+  max_patrol_altitude_ft_msl: 15000
+cas:
+  duration_minutes: 30
+sweep:
+  distance_nm: 10
 ground_unit_procurement_ratios:
     Tank: 3
     ATGM: 3
@@ -29,3 +26,7 @@ ground_unit_procurement_ratios:
     Artillery: 1
     SHORAD: 3
     Recon: 1
+helicopter:
+    combat_altitude_ft_agl: 200
+    rendezvous_altitude_ft_agl: 1500
+    air_assault_nav_altitude_ft_agl: 1500