Merge pull request #649 from Khopa/develop_2_3_x

Release 2.3.3

changelog.md

@@ -1,8 +1,3 @@
-# 2.3.4
-
-## Fixes:
-* **[Mission Generator]** Mission generator would crash when generating fire missions for destroyed SCUD sites - fixed
-
 # 2.3.3
 
 ## Features/Improvements

game/version.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 
 def _build_version_string() -> str:
-    components = ["2.3.4"]
+    components = ["2.3.3"]
     build_number_path = Path("resources/buildnumber")
     if build_number_path.exists():
         with build_number_path.open("r") as build_number_file:

gen/groundobjectsgen.py

@@ -121,15 +121,12 @@ class MissileSiteGenerator(GenericGroundObjectGenerator):
         # TODO : Add delay to task to spread fire task over mission duration ?
         for group in self.ground_object.groups:
             vg = self.m.find_group(group.name)
-            if vg is not None:
+            targets = self.possible_missile_targets(vg)
-                targets = self.possible_missile_targets(vg)
+            if vg is not None and targets:
-                if targets:
+                target = random.choice(targets)
-                    target = random.choice(targets)
+                real_target = target.point_from_heading(random.randint(0, 360), random.randint(0, 2500))
-                    real_target = target.point_from_heading(random.randint(0, 360), random.randint(0, 2500))
+                vg.points[0].add_task(FireAtPoint(real_target))
-                    vg.points[0].add_task(FireAtPoint(real_target))
+                logging.info("Set up fire task for missile group.")
-                    logging.info("Set up fire task for missile group.")
-                else:
-                    logging.info("Couldn't setup missile site to fire, no valid target in range.")
             else:
                 logging.info("Couldn't setup missile site to fire, group was not generated.")