From 14a3279b2c2fcd1dd9efefc8fbc6bb5c7015b933 Mon Sep 17 00:00:00 2001 From: David Pierron Date: Tue, 27 Oct 2020 10:06:22 +0100 Subject: [PATCH] cleaner way of adding a faction parameter to the groupgenerator constructor --- gen/sam/genericsam_group_generator.py | 4 ++++ gen/sam/group_generator.py | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gen/sam/genericsam_group_generator.py b/gen/sam/genericsam_group_generator.py index 00d5ed6e..d62374d5 100644 --- a/gen/sam/genericsam_group_generator.py +++ b/gen/sam/genericsam_group_generator.py @@ -9,6 +9,10 @@ class GenericSamGroupGenerator(GroupGenerator): """ This is the base for all SAM group generators """ + + def __init__(self, game, ground_object, faction): + self.faction = faction + super(GenericSamGroupGenerator, self).__init__(game, ground_object) @property def groupNamePrefix(self) -> str: diff --git a/gen/sam/group_generator.py b/gen/sam/group_generator.py index 9f150ef4..7e2e620d 100644 --- a/gen/sam/group_generator.py +++ b/gen/sam/group_generator.py @@ -8,12 +8,11 @@ from dcs.unit import Vehicle class GroupGenerator(): - def __init__(self, game, ground_object, faction = None): # faction is not mandatory because some subclasses do not use it + def __init__(self, game, ground_object): self.game = game self.go = ground_object self.position = ground_object.position self.heading = random.randint(0, 359) - self.faction = faction self.vg = unitgroup.VehicleGroup(self.game.next_group_id(), self.groupNamePrefix + self.go.group_identifier) wp = self.vg.add_waypoint(self.position, PointAction.OffRoad, 0) wp.ETA_locked = True