diff --git a/changelog.md b/changelog.md index 96061c2e..b30bdd30 100644 --- a/changelog.md +++ b/changelog.md @@ -8,12 +8,14 @@ * **[Units/Factions]** Added factions for Syria map : Syria 2011, Arab Armies 1982, 1973, 1968, 1948, Israel 1982, 1973, 1948 * **[Base Menu]** Budget is visible in recruitment menu. (Thanks to Github contributor root0fall) * **[Misc]** Added error message in mission when state file can not be written. +* **[Units/Factions]** China, Pakistan, UAE will now use the new WingLoong drone instead of MQ-9 reaper ## Fixed issues : * **[Mission Generator]** Caucasus terrain improvement on exclusions zone (added forests between Vaziani and Beslan to exlusion zones) * **[Mission Generator]** The first unit of every base defenses group could not be controlled by Combined Arms. * **[Mission Generator]** Fixed list of flights not refreshing when changing the mission departure (T+). +* **[Mission Generator]** Reduced generated helicopter altitude for CAS missions # 2.0.11 diff --git a/game/factions/pakistan_2015.py b/game/factions/pakistan_2015.py index b5fa5f29..67bfa2aa 100644 --- a/game/factions/pakistan_2015.py +++ b/game/factions/pakistan_2015.py @@ -36,5 +36,7 @@ Pakistan_2015 = { AirDefence.AAA_ZU_23_Closed ], "boat": [ "Type54GroupGenerator", "OliverHazardPerryGroupGenerator" - ], "has_jtac": True + ], + "has_jtac": True, + "jtac_unit": WingLoong_I } diff --git a/game/factions/uae_2005.py b/game/factions/uae_2005.py index 90990493..cc412f06 100644 --- a/game/factions/uae_2005.py +++ b/game/factions/uae_2005.py @@ -32,5 +32,7 @@ UAE_2005 = { Armed_speedboat, ], "boat":[ "OliverHazardPerryGroupGenerator" - ], "has_jtac": True + ], + "has_jtac": True, + "jtac_unit": WingLoong_I } \ No newline at end of file diff --git a/gen/flights/ai_flight_planner.py b/gen/flights/ai_flight_planner.py index 06d0355b..1582276d 100644 --- a/gen/flights/ai_flight_planner.py +++ b/gen/flights/ai_flight_planner.py @@ -607,7 +607,8 @@ class FlightPlanner: :param flight: Flight to setup :param location: Location of the CAS targets """ - + is_helo = hasattr(flight.unit_type, "helicopter") and flight.unit_type.helicopter + cap_alt = 1000 flight.points = [] flight.flight_type = FlightType.CAS @@ -616,9 +617,12 @@ class FlightPlanner: egress = ingress.point_from_heading(heading, distance) ascend = self.generate_ascend_point(flight.from_cp) + if is_helo: + cap_alt = 500 + ascend.alt = 500 flight.points.append(ascend) - ingress_point = FlightWaypoint(ingress.x, ingress.y, 1000) + ingress_point = FlightWaypoint(ingress.x, ingress.y, cap_alt) ingress_point.alt_type = "RADIO" ingress_point.name = "INGRESS" ingress_point.pretty_name = "INGRESS" @@ -626,7 +630,7 @@ class FlightPlanner: ingress_point.waypoint_type = FlightWaypointType.INGRESS_CAS flight.points.append(ingress_point) - center_point = FlightWaypoint(center.x, center.y, 1000) + center_point = FlightWaypoint(center.x, center.y, cap_alt) center_point.alt_type = "RADIO" center_point.description = "Provide CAS" center_point.name = "CAS" @@ -634,7 +638,7 @@ class FlightPlanner: center_point.waypoint_type = FlightWaypointType.CAS flight.points.append(center_point) - egress_point = FlightWaypoint(egress.x, egress.y, 1000) + egress_point = FlightWaypoint(egress.x, egress.y, cap_alt) egress_point.alt_type = "RADIO" egress_point.description = "Egress from CAS area" egress_point.name = "EGRESS" @@ -643,6 +647,8 @@ class FlightPlanner: flight.points.append(egress_point) descend = self.generate_descend_point(flight.from_cp) + if is_helo: + descend.alt = 300 flight.points.append(descend) rtb = self.generate_rtb_waypoint(flight.from_cp) diff --git a/resources/ui/units/aircrafts/MQ-1A Predator_24.jpg b/resources/ui/units/aircrafts/MQ-1A Predator_24.jpg new file mode 100644 index 00000000..f953e2ac Binary files /dev/null and b/resources/ui/units/aircrafts/MQ-1A Predator_24.jpg differ diff --git a/resources/ui/units/aircrafts/MQ-9 Reaper_24.jpg b/resources/ui/units/aircrafts/MQ-9 Reaper_24.jpg new file mode 100644 index 00000000..d49ef6d7 Binary files /dev/null and b/resources/ui/units/aircrafts/MQ-9 Reaper_24.jpg differ diff --git a/resources/ui/units/aircrafts/Mi-28_24.jpg b/resources/ui/units/aircrafts/Mi-28N_24.jpg similarity index 100% rename from resources/ui/units/aircrafts/Mi-28_24.jpg rename to resources/ui/units/aircrafts/Mi-28N_24.jpg diff --git a/resources/ui/units/aircrafts/WingLoong-I_24.jpg b/resources/ui/units/aircrafts/WingLoong-I_24.jpg new file mode 100644 index 00000000..32feeb36 Binary files /dev/null and b/resources/ui/units/aircrafts/WingLoong-I_24.jpg differ