From 2f210ab59fca7096f792affd72c7254ef381d208 Mon Sep 17 00:00:00 2001 From: Khopa Date: Sat, 25 Jul 2020 16:17:40 +0200 Subject: [PATCH] Fixed error in carrier group generator if faction has no destroyers --- gen/fleet/carrier_group.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gen/fleet/carrier_group.py b/gen/fleet/carrier_group.py index 30cffdaa..3951d093 100644 --- a/gen/fleet/carrier_group.py +++ b/gen/fleet/carrier_group.py @@ -23,11 +23,12 @@ class CarrierGroupGenerator(GroupGenerator): return # Add destroyers escort - dd_type = random.choice(self.faction["destroyer"]) - self.add_unit(dd_type, "DD1", self.position.x + 250, self.position.y + 450, self.heading) - self.add_unit(dd_type, "DD2", self.position.x + 250, self.position.y - 450, self.heading) + if "destroyer" in self.faction.keys(): + dd_type = random.choice(self.faction["destroyer"]) + self.add_unit(dd_type, "DD1", self.position.x + 250, self.position.y + 450, self.heading) + self.add_unit(dd_type, "DD2", self.position.x + 250, self.position.y - 450, self.heading) - self.add_unit(dd_type, "DD3", self.position.x + 450, self.position.y + 850, self.heading) - self.add_unit(dd_type, "DD4", self.position.x + 450, self.position.y - 850, self.heading) + self.add_unit(dd_type, "DD3", self.position.x + 450, self.position.y + 850, self.heading) + self.add_unit(dd_type, "DD4", self.position.x + 450, self.position.y - 850, self.heading) self.get_generated_group().points[0].speed = 20 \ No newline at end of file