weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove triggers from generated mission for now. Do not generate the 'quick' mission

Browse Source 
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)
This commit is contained in:
Khopa 2019-11-03 17:27:30 +01:00
parent e82db1fecd
commit 85de3a09ea
6 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/db.py
View File

@ -562,7 +562,7 @@ FACTIONS = {
"Spain 1990": Spain_1990, "Spain 1990": Spain_1990,
"Italy 1990": Italy_1990, "Italy 1990": Italy_1990,
"Sweden 1990": Sweden_1990, "Sweden 1990": Sweden_1990,
"Ukrain 2010": Ukraine_2010, "Ukraine 2010": Ukraine_2010,
"India 2010": India_2010, "India 2010": India_2010,
"Israel 2000": Israel_2000, "Israel 2000": Israel_2000,
"Turkey 2005": Turkey_2005, "Turkey 2005": Turkey_2005,

15
game/event/event.py
View File

@ -122,12 +122,15 @@ class Event:
self.environment_settings = self.operation.environment_settings self.environment_settings = self.operation.environment_settings
def generate_quick(self): def generate_quick(self):
self.operation.is_awacs_enabled = self.is_awacs_enabled pass
self.operation.environment_settings = self.environment_settings # 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.prepare(self.game.theater.terrain, is_quick=True) #self.operation.is_awacs_enabled = self.is_awacs_enabled
self.operation.generate() #self.operation.environment_settings = self.environment_settings
self.operation.current_mission.save(persistency.mission_path_for("liberation_nextturn_quick.miz")) #
#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): def commit(self, debriefing: Debriefing):

3
game/factions/usa_2005.py
View File

@ -28,6 +28,9 @@ USA_2005 = {
Armor.MBT_M1A2_Abrams, Armor.MBT_M1A2_Abrams,
Armor.ATGM_M1134_Stryker, Armor.ATGM_M1134_Stryker,
Armor.IFV_M2A2_Bradley, Armor.IFV_M2A2_Bradley,
Armor.IFV_LAV_25,
Armor.APC_M1043_HMMWV_Armament,
Armor.ATGM_M1045_HMMWV_TOW,
Unarmed.Transport_M818, Unarmed.Transport_M818,
Infantry.Infantry_M4, Infantry.Infantry_M4,

2
game/operation/operation.py
View File

@ -174,7 +174,7 @@ class Operation:
cp = self.conflict.to_cp cp = self.conflict.to_cp
self.triggersgen.generate(player_cp=cp, self.triggersgen.generate(player_cp=cp,
is_quick=self.is_quick, is_quick=False,
activation_trigger_radius=self.trigger_radius, activation_trigger_radius=self.trigger_radius,
awacs_enabled=self.is_awacs_enabled) awacs_enabled=self.is_awacs_enabled)

6
gen/flights/ai_flight_planner.py
View File

@ -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 from gen.flights.flight import Flight, FlightType, FlightWaypoint
# TODO : Ideally should be based on the aircraft type instead / Availability of fuel # TODO : Ideally should be based on the aircraft type instead / Availability of fuel
STRIKE_MAX_RANGE = 150000 STRIKE_MAX_RANGE = 1500000
SEAD_MAX_RANGE = 150000 SEAD_MAX_RANGE = 1500000
MAX_NUMBER_OF_INTERCEPTION_GROUP = 3 MAX_NUMBER_OF_INTERCEPTION_GROUP = 3
MISSION_DURATION = 120 # in minutes MISSION_DURATION = 120 # in minutes
@ -42,7 +42,7 @@ class FlightPlanner:
def reset(self): 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.aircraft_inventory = dict({k: v for k, v in self.from_cp.base.aircraft.items()})
self.interceptor_flights = [] self.interceptor_flights = []

8
gen/triggergen.py
View File

@ -196,8 +196,8 @@ class TriggersGenerator:
self._set_skill(player_coalition, enemy_coalition) self._set_skill(player_coalition, enemy_coalition)
self._set_allegiances(player_coalition, enemy_coalition) self._set_allegiances(player_coalition, enemy_coalition)
if not is_quick: #if not is_quick:
# TODO: waypoint parts of this should not be post-hacked but added in airgen # # 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_activation_trigger(activation_trigger_radius, player_cp, player_coalition, enemy_coalition)
self._gen_push_trigger(player_cp, player_coalition) # self._gen_push_trigger(player_cp, player_coalition)