weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move missiongenerator helper to missiongenerator.

Browse Source
This commit is contained in:
Dan Albert 2022-02-18 18:12:53 -08:00
parent 4f64329f25
commit ddfe4c00b1
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
game/db.py
View File

@ -2,8 +2,6 @@ from datetime import datetime
from enum import Enum from enum import Enum
from typing import Type from typing import Type
from dcs.countries import country_dict
# mypy can't resolve these if they're wildcard imports for some reason. # mypy can't resolve these if they're wildcard imports for some reason.
from dcs.ships import ( from dcs.ships import (
CVN_71, CVN_71,
@ -131,13 +129,6 @@ def upgrade_to_supercarrier(unit: Type[ShipType], name: str) -> Type[ShipType]:
return unit return unit
def country_id_from_name(name: str) -> int:
for k, v in country_dict.items():
if v.name == name:
return k
return -1
class DefaultLiveries: class DefaultLiveries:
class Default(Enum): class Default(Enum):
af_standard = "" af_standard = ""

16
game/missiongenerator/missiongenerator.py
View File

@ -10,7 +10,6 @@ from dcs import Mission, Point
from dcs.coalition import Coalition from dcs.coalition import Coalition
from dcs.countries import country_dict from dcs.countries import country_dict
from game import db
from game.dcs.helpers import unit_type_from_name from game.dcs.helpers import unit_type_from_name
from game.missiongenerator.aircraft.aircraftgenerator import ( from game.missiongenerator.aircraft.aircraftgenerator import (
AircraftGenerator, AircraftGenerator,
@ -48,6 +47,13 @@ if TYPE_CHECKING:
COMBINED_ARMS_SLOTS = 1 COMBINED_ARMS_SLOTS = 1
def country_id_from_name(name: str) -> int:
for k, v in country_dict.items():
if v.name == name:
return k
return -1
class MissionGenerator: class MissionGenerator:
def __init__(self, game: Game, time: datetime) -> None: def __init__(self, game: Game, time: datetime) -> None:
self.game = game self.game = game
@ -129,15 +135,15 @@ class MissionGenerator:
p_country = self.game.blue.country_name p_country = self.game.blue.country_name
e_country = self.game.red.country_name e_country = self.game.red.country_name
self.mission.coalition["blue"].add_country( self.mission.coalition["blue"].add_country(
country_dict[db.country_id_from_name(p_country)]() country_dict[country_id_from_name(p_country)]()
) )
self.mission.coalition["red"].add_country( self.mission.coalition["red"].add_country(
country_dict[db.country_id_from_name(e_country)]() country_dict[country_id_from_name(e_country)]()
) )
belligerents = [ belligerents = [
db.country_id_from_name(p_country), country_id_from_name(p_country),
db.country_id_from_name(e_country), country_id_from_name(e_country),
] ]
for country in country_dict.keys(): for country in country_dict.keys():
if country not in belligerents: if country not in belligerents: