From ff2ec07d83cd5c378b182a12144ee187f2592500 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sat, 12 Oct 2024 16:32:02 +0200 Subject: [PATCH] Move constants from laypout.py to theathergroup.py Should fix the "FIXED_POS_ARG not defined" error --- game/armedforces/forcegroup.py | 10 +++++++--- game/layout/layout.py | 4 ---- game/theater/theatergroup.py | 5 ++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/game/armedforces/forcegroup.py b/game/armedforces/forcegroup.py index 51c132f1..af62c6e7 100644 --- a/game/armedforces/forcegroup.py +++ b/game/armedforces/forcegroup.py @@ -19,8 +19,6 @@ from game.layout import LAYOUTS from game.layout.layout import ( TgoLayout, TgoLayoutUnitGroup, - FIXED_POS_ARG, - FIXED_HDG_ARG, ) from game.point_with_heading import PointWithHeading from game.theater.theatergroundobject import ( @@ -28,7 +26,13 @@ from game.theater.theatergroundobject import ( IadsBuildingGroundObject, NavalGroundObject, ) -from game.theater.theatergroup import IadsGroundGroup, IadsRole, TheaterGroup +from game.theater.theatergroup import ( + IadsGroundGroup, + IadsRole, + TheaterGroup, + FIXED_POS_ARG, + FIXED_HDG_ARG, +) from game.utils import escape_string_for_lua if TYPE_CHECKING: diff --git a/game/layout/layout.py b/game/layout/layout.py index 9f674a97..32e8fe7d 100644 --- a/game/layout/layout.py +++ b/game/layout/layout.py @@ -33,10 +33,6 @@ if TYPE_CHECKING: from game.theater.controlpoint import ControlPoint -FIXED_POS_ARG = "--fix-pos" -FIXED_HDG_ARG = "--fix-hdg" - - class LayoutException(Exception): pass diff --git a/game/theater/theatergroup.py b/game/theater/theatergroup.py index 07ea7169..1b8ef719 100644 --- a/game/theater/theatergroup.py +++ b/game/theater/theatergroup.py @@ -17,10 +17,13 @@ from game.theater.iadsnetwork.iadsrole import IadsRole from game.utils import Heading, Distance, meters if TYPE_CHECKING: - from game.layout.layout import LayoutUnit, FIXED_POS_ARG, FIXED_HDG_ARG + from game.layout.layout import LayoutUnit from game.sim import GameUpdateEvents from game.theater.theatergroundobject import TheaterGroundObject +FIXED_POS_ARG = "--fix-pos" +FIXED_HDG_ARG = "--fix-hdg" + @dataclass class TheaterUnit: