From 85de3a09ea234e039a08853e63d4d186729d865b Mon Sep 17 00:00:00 2001 From: Khopa Date: Sun, 3 Nov 2019 17:27:30 +0100 Subject: [PATCH] Remove triggers from generated mission for now. Do not generate the 'quick' mission Fix range for ai flight planner so they are more likely to plan CAS flights (It's up to the player to setup flight on the runway or in flight) --- game/db.py | 2 +- game/event/event.py | 15 +++++++++------ game/factions/usa_2005.py | 3 +++ game/operation/operation.py | 2 +- gen/flights/ai_flight_planner.py | 6 +++--- gen/triggergen.py | 8 ++++---- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/game/db.py b/game/db.py index d4b136ca..4ac5539c 100644 --- a/game/db.py +++ b/game/db.py @@ -562,7 +562,7 @@ FACTIONS = { "Spain 1990": Spain_1990, "Italy 1990": Italy_1990, "Sweden 1990": Sweden_1990, - "Ukrain 2010": Ukraine_2010, + "Ukraine 2010": Ukraine_2010, "India 2010": India_2010, "Israel 2000": Israel_2000, "Turkey 2005": Turkey_2005, diff --git a/game/event/event.py b/game/event/event.py index 58de2b63..0c44c1d0 100644 --- a/game/event/event.py +++ b/game/event/event.py @@ -122,12 +122,15 @@ class Event: self.environment_settings = self.operation.environment_settings def generate_quick(self): - self.operation.is_awacs_enabled = self.is_awacs_enabled - self.operation.environment_settings = self.environment_settings - - self.operation.prepare(self.game.theater.terrain, is_quick=True) - self.operation.generate() - self.operation.current_mission.save(persistency.mission_path_for("liberation_nextturn_quick.miz")) + pass + # TODO : This is not needed anymore. The player can start mission in flight from the flight planner if he want it to be quick. + # TODO : remove this method + #self.operation.is_awacs_enabled = self.is_awacs_enabled + #self.operation.environment_settings = self.environment_settings + # + #self.operation.prepare(self.game.theater.terrain, is_quick=True) + #self.operation.generate() + #self.operation.current_mission.save(persistency.mission_path_for("liberation_nextturn_quick.miz")) def commit(self, debriefing: Debriefing): diff --git a/game/factions/usa_2005.py b/game/factions/usa_2005.py index b07d8256..08bcde4a 100644 --- a/game/factions/usa_2005.py +++ b/game/factions/usa_2005.py @@ -28,6 +28,9 @@ USA_2005 = { Armor.MBT_M1A2_Abrams, Armor.ATGM_M1134_Stryker, Armor.IFV_M2A2_Bradley, + Armor.IFV_LAV_25, + Armor.APC_M1043_HMMWV_Armament, + Armor.ATGM_M1045_HMMWV_TOW, Unarmed.Transport_M818, Infantry.Infantry_M4, diff --git a/game/operation/operation.py b/game/operation/operation.py index 761a5108..e389ad3f 100644 --- a/game/operation/operation.py +++ b/game/operation/operation.py @@ -174,7 +174,7 @@ class Operation: cp = self.conflict.to_cp self.triggersgen.generate(player_cp=cp, - is_quick=self.is_quick, + is_quick=False, activation_trigger_radius=self.trigger_radius, awacs_enabled=self.is_awacs_enabled) diff --git a/gen/flights/ai_flight_planner.py b/gen/flights/ai_flight_planner.py index 4c23fe4f..8109e228 100644 --- a/gen/flights/ai_flight_planner.py +++ b/gen/flights/ai_flight_planner.py @@ -8,8 +8,8 @@ from gen.flights.ai_flight_planner_db import INTERCEPT_CAPABLE, CAP_CAPABLE, CAS from gen.flights.flight import Flight, FlightType, FlightWaypoint # TODO : Ideally should be based on the aircraft type instead / Availability of fuel -STRIKE_MAX_RANGE = 150000 -SEAD_MAX_RANGE = 150000 +STRIKE_MAX_RANGE = 1500000 +SEAD_MAX_RANGE = 1500000 MAX_NUMBER_OF_INTERCEPTION_GROUP = 3 MISSION_DURATION = 120 # in minutes @@ -42,7 +42,7 @@ class FlightPlanner: def reset(self): """ - Reset the planned flights and avaialble units + Reset the planned flights and available units """ self.aircraft_inventory = dict({k: v for k, v in self.from_cp.base.aircraft.items()}) self.interceptor_flights = [] diff --git a/gen/triggergen.py b/gen/triggergen.py index 55b7cae5..f9accba2 100644 --- a/gen/triggergen.py +++ b/gen/triggergen.py @@ -196,8 +196,8 @@ class TriggersGenerator: self._set_skill(player_coalition, enemy_coalition) self._set_allegiances(player_coalition, enemy_coalition) - if not is_quick: - # TODO: waypoint parts of this should not be post-hacked but added in airgen - self._gen_activation_trigger(activation_trigger_radius, player_cp, player_coalition, enemy_coalition) - self._gen_push_trigger(player_cp, player_coalition) + #if not is_quick: + # # TODO: waypoint parts of this should not be post-hacked but added in airgen + # self._gen_activation_trigger(activation_trigger_radius, player_cp, player_coalition, enemy_coalition) + # self._gen_push_trigger(player_cp, player_coalition)