Refactor Templates to Layouts, Review and Cleanup

- Fix tgogenerator - Fix UI for ForceGroup and Layouts - Fix ammo depot handling - Split bigger files in smaller meaningful files (TGO, layouts, forces) - Renamed Template to Layout - Renamed GroundGroup to TheaterGroup and GroundUnit to TheaterUnit - Reorganize Layouts and UnitGroups to a ArmedForces class and ForceGroup similar to the AirWing and Squadron - Reworded the UnitClass, GroupRole, GroupTask (adopted to PEP8) and reworked the connection from Role and Task - added comments - added missing unit classes - added temp workaround for missing classes - add repariable property to TheaterUnit - Review and Cleanup Added serialization for loaded templates Loading the templates from the .miz files takes a lot of computation time and in the future there will be more templates added to the system. Therefore a local pickle serialization for the loaded templates was re-added: - The pickle will be created the first time the TemplateLoader will be accessed - Pickle is stored in Liberation SaveDir - Added UI option to (re-)import templates
2025-11-10 15:41:24 +00:00 · 2022-02-10 12:23:16 +01:00
parent 1ae6503ceb
commit 2c17a9a52e
138 changed files with 1985 additions and 3096 deletions
--- a/resources/units/unit_groups/Ally-Flak.yaml
+++ b/resources/units/unit_groups/Ally-Flak.yaml
@@ -2,7 +2,7 @@ name: Ally Flak
 role: AntiAir
 tasks:
  - AAA
-ground_units:
+units:
  - QF 3.7-inch AA Gun
  - M1 37mm Gun
  - M45 Quadmount
@@ -10,5 +10,5 @@ ground_units:
  - M30 Cargo Carrier
  - M4 High-Speed Tractor
  - Truck Bedford
-templates:
+layouts:
  - WW2 Ally Flak Site
--- a/resources/units/unit_groups/Carrier_Strike_Group_8.yaml
+++ b/resources/units/unit_groups/Carrier_Strike_Group_8.yaml
@@ -2,9 +2,9 @@ name: Carrier Strike Group 8
 role: Naval
 tasks:
  - Navy
-ship_units:
+units:
  - CVN-74 John C. Stennis
  - DDG Arleigh Burke IIa
  - CG Ticonderoga
-templates:
+layouts:
  - Carrier Strike Group 8
--- a/resources/units/unit_groups/Chinese-Navy.yaml
+++ b/resources/units/unit_groups/Chinese-Navy.yaml
@@ -2,9 +2,9 @@ name: Chinese Navy
 role: Naval
 tasks:
  - Navy
-ship_units:
+units:
  - Type 052C Destroyer
  - Type 052B Destroyer
  - Type 054A Frigate
-templates:
+layouts:
  - Naval Group
--- a/resources/units/unit_groups/Cold-War-Flak.yaml
+++ b/resources/units/unit_groups/Cold-War-Flak.yaml
@@ -2,8 +2,8 @@ name: Cold-War-Flak
 role: AntiAir
 tasks:
  - AAA
-ground_units:
+units:
  - 8.8 cm Flak 18
  - S-60 57mm
-templates:
+layouts:
  - Cold War Flak Site
--- a/resources/units/unit_groups/Flak.yaml
+++ b/resources/units/unit_groups/Flak.yaml
@@ -2,7 +2,7 @@ name: Flak
 role: AntiAir
 tasks:
  - AAA
-ground_units:
+units:
  - 2 cm Flakvierling 38
  - 8.8 cm Flak 18
  - 8.8 cm Flak 36
@@ -14,5 +14,5 @@ ground_units:
  - AAA SP Kdo.G.40
  - LUV Kubelwagen 82
  - Truck Opel Blitz
-templates:
+layouts:
  - Flak Site
--- a/resources/units/unit_groups/Freya.yaml
+++ b/resources/units/unit_groups/Freya.yaml
@@ -2,7 +2,7 @@ name: Freya
 role: AntiAir
 tasks:
  - SHORAD
-ground_units:
+units:
  - EWR FuMG-401 Freya LZ
  - 2 cm Flakvierling 38
  - 8.8 cm Flak 18
@@ -12,5 +12,5 @@ ground_units:
  - PU Maschinensatz_33
  - AAA SP Kdo.G.40
  - Infantry Mauser 98
-templates:
+layouts:
  - Freya EWR Site
--- a/resources/units/unit_groups/HQ-7.yaml
+++ b/resources/units/unit_groups/HQ-7.yaml
@@ -2,8 +2,8 @@ name: HQ-7
 role: AntiAir
 tasks:
  - SHORAD
-ground_units:
+units:
  - HQ-7 Self-Propelled STR
  - HQ-7 Launcher
-templates:
+layouts:
  - HQ-7 Site
--- a/resources/units/unit_groups/Hawk.yaml
+++ b/resources/units/unit_groups/Hawk.yaml
@@ -2,10 +2,10 @@ name: Hawk
 role: AntiAir
 tasks:
  - MERAD
-ground_units:
+units:
  - SAM Hawk SR (AN/MPQ-50)
  - SAM Hawk Platoon Command Post (PCP)
  - SAM Hawk TR (AN/MPQ-46)
  - SAM Hawk LN M192
-templates:
+layouts:
  - Hawk Site
--- a/resources/units/unit_groups/KS-19.yaml
+++ b/resources/units/unit_groups/KS-19.yaml
@@ -2,8 +2,8 @@ name: KS-19
 role: AntiAir
 tasks:
  - AAA
-ground_units:
+units:
  - AAA SON-9 Fire Can
  - AAA 100mm KS-19
-templates:
+layouts:
  - AAA Radar Site
--- a/resources/units/unit_groups/NASAMS-B.yaml
+++ b/resources/units/unit_groups/NASAMS-B.yaml
@@ -2,9 +2,9 @@ name: NASAMS AIM-120B
 role: AntiAir
 tasks:
  - MERAD
-ground_units:
+units:
  - SAM NASAMS C2
  - SAM NASAMS SR MPQ64F1
  - SAM NASAMS LN AIM-120B
-templates:
+layouts:
  - NASAMS AIM-120B
--- a/resources/units/unit_groups/NASAMS-C.yaml
+++ b/resources/units/unit_groups/NASAMS-C.yaml
@@ -2,9 +2,9 @@ name: NASAMS AIM-120C
 role: AntiAir
 tasks:
  - MERAD
-ground_units:
+units:
  - SAM NASAMS C2
  - SAM NASAMS SR MPQ64F1
  - SAM NASAMS LN AIM-120C
-templates:
+layouts:
  - NASAMS AIM-120C
--- a/resources/units/unit_groups/Patriot.yaml
+++ b/resources/units/unit_groups/Patriot.yaml
@@ -2,12 +2,12 @@ name: Patriot
 role: AntiAir
 tasks:
  - LORAD
-ground_units:
+units:
  - SAM Patriot STR
  - SAM Patriot CR (AMG AN/MRC-137)
  - SAM Patriot ECS
  - SAM Patriot C2 ICC
  - SAM Patriot EPP-III
  - SAM Patriot LN
-templates:
+layouts:
  - Patriot Battery
--- a/resources/units/unit_groups/Rapier.yaml
+++ b/resources/units/unit_groups/Rapier.yaml
@@ -2,9 +2,9 @@ name: Rapier
 role: AntiAir
 tasks:
  - SHORAD
-ground_units:
+units:
  - SAM Rapier Blindfire TR
  - SAM Rapier Tracker
  - SAM Rapier LN
-templates:
+layouts:
  - Rapier AA Site
--- a/resources/units/unit_groups/Roland.yaml
+++ b/resources/units/unit_groups/Roland.yaml
@@ -2,8 +2,8 @@ name: Roland
 role: AntiAir
 tasks:
  - SHORAD
-ground_units:
+units:
  - SAM Roland EWR
  - Roland 2 (Marder Chassis)
-templates:
+layouts:
  - Roland Site
--- a/resources/units/unit_groups/Russian-Navy.yaml
+++ b/resources/units/unit_groups/Russian-Navy.yaml
@@ -2,11 +2,11 @@ name: Russian Navy
 role: Naval
 tasks:
  - Navy
-ship_units:
+units:
  - Corvette 1124.4 Grish
  - Corvette 1241.1 Molniya
  - Frigate 11540 Neustrashimy
  - Frigate 1135M Rezky
  - Cruiser 1164 Moskva
-templates:
+layouts:
  - Naval Group
--- a/resources/units/unit_groups/SA-10.yaml
+++ b/resources/units/unit_groups/SA-10.yaml
@@ -2,12 +2,12 @@ name: SA-10/S-300PS
 role: AntiAir
 tasks:
  - LORAD
-ground_units:
+units:
  - SAM SA-10 S-300 "Grumble" Clam Shell SR
  - SAM SA-10 S-300 "Grumble" Big Bird SR
  - SAM SA-10 S-300 "Grumble" C2
  - SAM SA-10 S-300 "Grumble" Flap Lid TR
  - SAM SA-10 S-300 "Grumble" TEL D
  - SAM SA-10 S-300 "Grumble" TEL C
-templates:
+layouts:
  - S-300 Site
--- a/resources/units/unit_groups/SA-10B.yaml
+++ b/resources/units/unit_groups/SA-10B.yaml
@@ -2,12 +2,12 @@ name: SA-10B/S-300PS
 role: AntiAir
 tasks:
  - LORAD
-ground_units:
+units:
  - SAM SA-10B S-300PS 40B6MD SR
  - SAM SA-10B S-300PS 64H6E SR
  - SAM SA-10B S-300PS 54K6 CP
  - SAM SA-10B S-300PS 30N6 TR
  - SAM SA-10B S-300PS 5P85SE LN
  - SAM SA-10B S-300PS 5P85SU LN
-templates:
+layouts:
  - S-300 Site
--- a/resources/units/unit_groups/SA-11.yaml
+++ b/resources/units/unit_groups/SA-11.yaml
@@ -2,9 +2,9 @@ name: SA-11
 role: AntiAir
 tasks:
  - MERAD
-ground_units:
+units:
  - SAM SA-11 Buk "Gadfly" Snow Drift SR
  - SAM SA-11 Buk "Gadfly" C2
  - SAM SA-11 Buk "Gadfly" Fire Dome TEL
-templates:
+layouts:
  - SA-11 Buk Battery
--- a/resources/units/unit_groups/SA-12.yaml
+++ b/resources/units/unit_groups/SA-12.yaml
@@ -2,12 +2,12 @@ name: SA-12/S-300V
 role: AntiAir
 tasks:
  - LORAD
-ground_units:
+units:
  - SAM SA-12 S-300V 9S15 SR
  - SAM SA-12 S-300V 9S19 SR
  - SAM SA-12 S-300V 9S457 CP
  - SAM SA-12 S-300V 9S32 TR
  - SAM SA-12 S-300V 9A82 LN
  - SAM SA-12 S-300V 9A83 LN
-templates:
+layouts:
  - S-300 Site
--- a/resources/units/unit_groups/SA-17.yaml
+++ b/resources/units/unit_groups/SA-17.yaml
@@ -2,9 +2,9 @@ name: SA-17
 role: AntiAir
 tasks:
  - MERAD
-ground_units:
+units:
  - SAM SA-11 Buk "Gadfly" Snow Drift SR
  - SAM SA-11 Buk "Gadfly" C2
  - SAM SA-17 Buk M1-2 LN 9A310M1-2
-templates:
+layouts:
  - SA-17 Grizzly Battery
--- a/resources/units/unit_groups/SA-2.yaml
+++ b/resources/units/unit_groups/SA-2.yaml
@@ -2,9 +2,9 @@ name: SA-2/S-75
 role: AntiAir
 tasks:
  - MERAD
-ground_units:
+units:
  - SAM P19 "Flat Face" SR (SA-2/3)
  - SAM SA-2 S-75 "Fan Song" TR
  - SAM SA-2 S-75 "Guideline" LN
-templates:
+layouts:
  - SA-2/S-75 Site
--- a/resources/units/unit_groups/SA-20.yaml
+++ b/resources/units/unit_groups/SA-20.yaml
@@ -2,12 +2,12 @@ name: SA-20/S-300PMU-1
 role: AntiAir
 tasks:
  - LORAD
-ground_units:
+units:
  - SAM SA-20 S-300PMU1 SR 5N66E
  - SAM SA-20 S-300PMU1 SR 64N6E
  - SAM SA-20 S-300PMU1 CP 54K6
  - SAM SA-20 S-300PMU1 TR 30N6E
  - SAM SA-20 S-300PMU1 LN 5P85CE
  - SAM SA-20 S-300PMU1 LN 5P85DE
-templates:
+layouts:
  - S-300 Site
--- a/resources/units/unit_groups/SA-20B.yaml
+++ b/resources/units/unit_groups/SA-20B.yaml
@@ -2,11 +2,11 @@ name: SA-20B/S-300PMU-2
 role: AntiAir
 tasks:
  - LORAD
-ground_units:
+units:
  - SAM SA-20 S-300PMU1 SR 5N66E
  - SAM SA-20 S-300PMU1 SR 64N6E
  - SAM SA-20B S-300PMU2 CP 54K6E2
  - SAM SA-20B S-300PMU2 TR 92H6E(truck)
  - SAM SA-20B S-300PMU2 LN 5P85SE2
-templates:
+layouts:
  - S-300 Site
--- a/resources/units/unit_groups/SA-23.yaml
+++ b/resources/units/unit_groups/SA-23.yaml
@@ -2,12 +2,12 @@ name: SA-23/S-300VM
 role: AntiAir
 tasks:
  - LORAD
-ground_units:
+units:
  - SAM SA-23 S-300VM 9S15M2 SR
  - SAM SA-23 S-300VM 9S19M2 SR
  - SAM SA-23 S-300VM 9S457ME CP
  - SAM SA-23 S-300VM 9S32ME TR
  - SAM SA-23 S-300VM 9A82ME LN
  - SAM SA-23 S-300VM 9A83ME LN
-templates:
+layouts:
  - S-300 Site
--- a/resources/units/unit_groups/SA-3.yaml
+++ b/resources/units/unit_groups/SA-3.yaml
@@ -2,9 +2,9 @@ name: SA-3/S-125
 role: AntiAir
 tasks:
  - MERAD
-ground_units:
+units:
  - SAM P19 "Flat Face" SR (SA-2/3)
  - SAM SA-3 S-125 "Low Blow" TR
  - SAM SA-3 S-125 "Goa" LN
-templates:
+layouts:
  - SA-3/S-125 Site
--- a/resources/units/unit_groups/SA-5.yaml
+++ b/resources/units/unit_groups/SA-5.yaml
@@ -2,9 +2,9 @@ name: SA-5/S-200
 role: AntiAir
 tasks:
  - LORAD
-ground_units:
+units:
  - SAM SA-5 S-200 ST-68U "Tin Shield" SR
  - SAM SA-5 S-200 "Square Pair" TR"
  - SAM SA-5 S-200 "Gammon" LN"
-templates:
+layouts:
  - SA-5/S-200 Site
--- a/resources/units/unit_groups/SA-6.yaml
+++ b/resources/units/unit_groups/SA-6.yaml
@@ -2,8 +2,8 @@ name: SA-6
 role: AntiAir
 tasks:
  - MERAD
-ground_units:
+units:
  - SAM SA-6 Kub "Straight Flush" STR
  - SAM SA-6 Kub "Gainful" TEL
-templates:
+layouts:
  - SA-6 Kub Site
--- a/resources/units/unit_groups/Silkworm.yaml
+++ b/resources/units/unit_groups/Silkworm.yaml
@@ -2,8 +2,8 @@ name: Silkworm
 role: Defenses
 tasks:
  - Coastal
-ground_units:
+units:
  - AShM SS-N-2 Silkworm
  - AShM Silkworm SR
-templates:
+layouts:
  - Silkworm
--- a/resources/units/unit_groups/WW2LST.yaml
+++ b/resources/units/unit_groups/WW2LST.yaml
@@ -2,8 +2,8 @@ name: WW2LST
 role: Naval
 tasks:
  - Navy
-ship_units:
+units:
  - LS Samuel Chase
  - LST Mk.II
-templates:
+layouts:
  - WW2 LST Group