Rename & Extend WW2-Essex layout to support ARA-VDM + CVA-31

game/armedforces/armedforces.py

@@ -40,7 +40,7 @@ class ArmedForces:
         # all layouts which are usable by the given faction.
         for layout in LAYOUTS.layouts:
             if layout.generic and layout.usable_by_faction(faction):
-                # Creates a faction compatible GorceGroup
+                # Creates a faction compatible ForceGroup
                 self.add_or_update_force_group(ForceGroup.for_layout(layout, faction))
 
         # Add all preset groups afterwards to prevent them being merged with generics

resources/groups/WW2Essex.yaml

@@ -4,4 +4,4 @@ tasks:
 units:
   - USS Bennington (CV-20)
 layouts:
-  - WW2 Essex Carrier
+  - Single Carrier

resources/layouts/naval/Carrier_Group_Single.yaml

@@ -1,10 +1,13 @@
-name: WW2 Essex Carrier
+name: Single Carrier
 tasks:
   - AircraftCarrier
+generic: true
 groups:
   - Carrier: # the word "Carrier" or "LHA" needs to be present in the group-name
-    - name: WW2 Carrier Group 0
+    - name: Carrier Group 0
       unit_count:
         - 1
       unit_types:
+        - ara_vdm
         - Essex
+        - cva-31