Single ShipGroupGenerator added

gen/fleet/carrier_group.py

@@ -1,13 +1,9 @@
 import random
 
-from gen.sam.group_generator import GroupGenerator
+from gen.sam.group_generator import ShipGroupGenerator
 
 
-class CarrierGroupGenerator(GroupGenerator):
+class CarrierGroupGenerator(ShipGroupGenerator):
-
-    def __init__(self, game, ground_object, faction):
-        super(CarrierGroupGenerator, self).__init__(game, ground_object)
-        self.faction = faction
     
     def generate(self):
 

gen/fleet/cn_dd_group.py

@@ -1,15 +1,11 @@
 import random
 
 from gen.fleet.dd_group import DDGroupGenerator
-from gen.sam.group_generator import GroupGenerator
+from gen.sam.group_generator import ShipGroupGenerator
 from dcs.ships import *
 
 
-class ChineseNavyGroupGenerator(GroupGenerator):
+class ChineseNavyGroupGenerator(ShipGroupGenerator):
-
-    def __init__(self, game, ground_object, faction):
-        super(ChineseNavyGroupGenerator, self).__init__(game, ground_object)
-        self.faction = faction
 
     def generate(self):
 

gen/fleet/dd_group.py

@@ -1,23 +1,13 @@
 import random
 
-from gen.sam.group_generator import GroupGenerator
+from gen.sam.group_generator import ShipGroupGenerator
-from dcs import unitgroup
-from dcs.point import PointAction
-from dcs.unit import Ship
 from dcs.ships import *
 
 
-class DDGroupGenerator(GroupGenerator):
+class DDGroupGenerator(ShipGroupGenerator):
 
     def __init__(self, game, ground_object, faction, ddtype):
-        self.game = game
+        super(DDGroupGenerator, self).__init__(game, ground_object, faction, ddtype)
-        self.go = ground_object
-        self.position = ground_object.position
-        self.heading = random.randint(0, 359)
-        self.faction = faction
-        self.vg = unitgroup.ShipGroup(self.game.next_group_id(), self.groupNamePrefix + self.go.group_identifier)
-        wp = self.vg.add_waypoint(self.position, 0)
-        wp.ETA_locked = True
         self.ddtype = ddtype
 
     def generate(self):
@@ -25,17 +15,6 @@ class DDGroupGenerator(GroupGenerator):
         self.add_unit(self.ddtype, "DD2", self.position.x + 500, self.position.y - 900, self.heading)
         self.get_generated_group().points[0].speed = 20
 
-    def add_unit(self, unit_type, name, pos_x, pos_y, heading):
-        nn = "cgroup|" + str(self.go.cp_id) + '|' + str(self.go.group_id) + '|' + str(self.go.group_identifier) + "|" + name
-
-        unit = Ship(self.game.next_unit_id(),
-                       nn, unit_type)
-        unit.position.x = pos_x
-        unit.position.y = pos_y
-        unit.heading = heading
-        self.vg.add_unit(unit)
-        return unit
-
 
 
 class OliverHazardPerryGroupGenerator(DDGroupGenerator):

gen/fleet/lha_group.py

@@ -1,13 +1,9 @@
 import random
 
-from gen.sam.group_generator import GroupGenerator
+from gen.sam.group_generator import ShipGroupGenerator
 
 
-class LHAGroupGenerator(GroupGenerator):
+class LHAGroupGenerator(ShipGroupGenerator):
-
-    def __init__(self, game, ground_object, faction):
-        super(LHAGroupGenerator, self).__init__(game, ground_object)
-        self.faction = faction
 
     def generate(self):
 

gen/fleet/ru_dd_group.py

@@ -1,15 +1,11 @@
 import random
 
 from gen.fleet.dd_group import DDGroupGenerator
-from gen.sam.group_generator import GroupGenerator
+from gen.sam.group_generator import ShipGroupGenerator
 from dcs.ships import *
 
 
-class RussianNavyGroupGenerator(GroupGenerator):
+class RussianNavyGroupGenerator(ShipGroupGenerator):
-
-    def __init__(self, game, ground_object, faction):
-        super(RussianNavyGroupGenerator, self).__init__(game, ground_object)
-        self.faction = faction
 
     def generate(self):
 

gen/fleet/schnellboot.py

@@ -2,14 +2,10 @@ import random
 
 from dcs.ships import Schnellboot_type_S130
 
-from gen.sam.group_generator import GroupGenerator
+from gen.sam.group_generator import ShipGroupGenerator
 
 
-class SchnellbootGroupGenerator(GroupGenerator):
+class SchnellbootGroupGenerator(ShipGroupGenerator):
-
-    def __init__(self, game, ground_object, faction):
-        super(SchnellbootGroupGenerator, self).__init__(game, ground_object)
-        self.faction = faction
 
     def generate(self):
 

gen/fleet/ship_group_generator.py

@@ -11,6 +11,9 @@ from gen.fleet.ru_dd_group import RussianNavyGroupGenerator, GrishaGroupGenerato
 from gen.fleet.schnellboot import SchnellbootGroupGenerator
 from gen.fleet.uboat import UBoatGroupGenerator
 from gen.fleet.ww2lst import WW2LSTGroupGenerator
+# from dcs import unitgroup
+# from dcs.unit import Ship
+
 
 SHIP_MAP = {
     "SchnellbootGroupGenerator": SchnellbootGroupGenerator,
@@ -69,3 +72,26 @@ def generate_lha_group(faction:str, game, ground_object):
     generator = LHAGroupGenerator(game, ground_object, db.FACTIONS[faction])
     generator.generate()
     return generator.get_generated_group()
+
+# class ShipGroupGenerator(GroupGenerator):
+#     """Abstract class for other ship generator classes"""
+#     def __init__(self, game, ground_object, faction):
+#         self.game = game
+#         self.go = ground_object
+#         self.position = ground_object.position
+#         self.heading = random.randint(0, 359)
+#         self.faction = faction
+#         self.vg = unitgroup.ShipGroup(self.game.next_group_id(), self.groupNamePrefix + self.go.group_identifier)
+#         wp = self.vg.add_waypoint(self.position, 0)
+#         wp.ETA_locked = True
+    
+#     def add_unit(self, unit_type, name, pos_x, pos_y, heading):
+#         nn = "cgroup|" + str(self.go.cp_id) + '|' + str(self.go.group_id) + '|' + str(self.go.group_identifier) + "|" + name
+
+#         unit = Ship(self.game.next_unit_id(),
+#                        nn, unit_type)
+#         unit.position.x = pos_x
+#         unit.position.y = pos_y
+#         unit.heading = heading
+#         self.vg.add_unit(unit)
+#         return unit

gen/fleet/uboat.py

@@ -2,14 +2,10 @@ import random
 
 from dcs.ships import Uboat_VIIC_U_flak
 
-from gen.sam.group_generator import GroupGenerator
+from gen.sam.group_generator import ShipGroupGenerator
 
 
-class UBoatGroupGenerator(GroupGenerator):
+class UBoatGroupGenerator(ShipGroupGenerator):
-
-    def __init__(self, game, ground_object, faction):
-        super(UBoatGroupGenerator, self).__init__(game, ground_object)
-        self.faction = faction
 
     def generate(self):
 

gen/fleet/ww2lst.py

@@ -2,14 +2,10 @@ import random
 
 from dcs.ships import LS_Samuel_Chase, LST_Mk_II
 
-from gen.sam.group_generator import GroupGenerator
+from gen.sam.group_generator import ShipGroupGenerator
 
 
-class WW2LSTGroupGenerator(GroupGenerator):
+class WW2LSTGroupGenerator(ShipGroupGenerator):
-
-    def __init__(self, game, ground_object, faction):
-        super(WW2LSTGroupGenerator, self).__init__(game, ground_object)
-        self.faction = faction
 
     def generate(self):
 

gen/sam/group_generator.py

@@ -3,7 +3,7 @@ import random
 
 from dcs import unitgroup
 from dcs.point import PointAction
-from dcs.unit import Vehicle
+from dcs.unit import Vehicle, Ship
 
 
 class GroupGenerator():
@@ -75,3 +75,25 @@ class GroupGenerator():
             current_offset += outer_offset
         return positions
 
+class ShipGroupGenerator(GroupGenerator):
+    """Abstract class for other ship generator classes"""
+    def __init__(self, game, ground_object, faction):
+        self.game = game
+        self.go = ground_object
+        self.position = ground_object.position
+        self.heading = random.randint(0, 359)
+        self.faction = faction
+        self.vg = unitgroup.ShipGroup(self.game.next_group_id(), self.groupNamePrefix + self.go.group_identifier)
+        wp = self.vg.add_waypoint(self.position, 0)
+        wp.ETA_locked = True
+    
+    def add_unit(self, unit_type, name, pos_x, pos_y, heading):
+        nn = "cgroup|" + str(self.go.cp_id) + '|' + str(self.go.group_id) + '|' + str(self.go.group_identifier) + "|" + name
+
+        unit = Ship(self.game.next_unit_id(),
+                       nn, unit_type)
+        unit.position.x = pos_x
+        unit.position.y = pos_y
+        unit.heading = heading
+        self.vg.add_unit(unit)
+        return unit