From 2f16916ac4c640ef1d43964710cd0c4bd7b78edf Mon Sep 17 00:00:00 2001 From: Raffson Date: Sun, 26 Oct 2025 18:21:38 +0100 Subject: [PATCH] Rename & Extend WW2-Essex layout to support ARA-VDM + CVA-31 --- game/armedforces/armedforces.py | 2 +- resources/groups/WW2Essex.yaml | 2 +- ...x_Carrier.miz => Carrier_Group_Single.miz} | Bin 9974 -> 9892 bytes ...Carrier.yaml => Carrier_Group_Single.yaml} | 7 +++++-- 4 files changed, 7 insertions(+), 4 deletions(-) rename resources/layouts/naval/{WW2-Essex_Carrier.miz => Carrier_Group_Single.miz} (71%) rename resources/layouts/naval/{WW2-Essex_Carrier.yaml => Carrier_Group_Single.yaml} (64%) diff --git a/game/armedforces/armedforces.py b/game/armedforces/armedforces.py index b829a604..b2666266 100644 --- a/game/armedforces/armedforces.py +++ b/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 diff --git a/resources/groups/WW2Essex.yaml b/resources/groups/WW2Essex.yaml index 22624be2..301ce369 100644 --- a/resources/groups/WW2Essex.yaml +++ b/resources/groups/WW2Essex.yaml @@ -4,4 +4,4 @@ tasks: units: - USS Bennington (CV-20) layouts: - - WW2 Essex Carrier \ No newline at end of file + - Single Carrier \ No newline at end of file diff --git a/resources/layouts/naval/WW2-Essex_Carrier.miz b/resources/layouts/naval/Carrier_Group_Single.miz similarity index 71% rename from resources/layouts/naval/WW2-Essex_Carrier.miz rename to resources/layouts/naval/Carrier_Group_Single.miz index a1dcb96eb5d31d9877bc403e84226fc44c1a430d..2312b72c330db216c8ce6e4793021364baafbe3d 100644 GIT binary patch delta 2551 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 E00