mirror of
https://github.com/dcs-liberation/dcs_liberation.git
synced 2025-11-10 14:22:26 +00:00
Fix incorrect pydcs import paths.
I've been wrongly importing these from `pydcs.dcs` instead of just `dcs`, because that was what PyCharm thought they were. These will all be broken when we get back to using a real pydcs instead of relying on its directory being in our tree. This page in the wiki should be updated: https://github.com/Khopa/dcs_liberation/wiki/Developer's-Guide Instead of recommending that `PYTHONPATH` be updated in the run configuration, it should instead recommend that Settings -> Project: dcs_liberation -> Project Structure be set to exclude the pydcs directory from the dcs_liberation content root, and add the pydcs directory as a *separate* content root. Alternatively, we could recommend that configure a virtualenv (good advice anyway, and pycharm knows how to set them up) that have people run `pip install -e pydcs`. I think even easier would be switching from the virtualenv-style requirements.txt to pipenv, which can actually encode the `-e` style pip install into its equivalent of requirements.txt.
This commit is contained in:
@@ -1,14 +1,8 @@
|
||||
from dcs.statics import *
|
||||
from dcs.unit import Ship, Vehicle
|
||||
|
||||
from game.data.building_data import FORTIFICATION_UNITS_ID, FORTIFICATION_UNITS
|
||||
from game.db import unit_type_from_name
|
||||
from pydcs.dcs.mission import *
|
||||
from pydcs.dcs.statics import *
|
||||
from pydcs.dcs.task import (
|
||||
ActivateBeaconCommand,
|
||||
ActivateICLSCommand,
|
||||
OptAlarmState,
|
||||
)
|
||||
from pydcs.dcs.unit import Ship, Vehicle
|
||||
from pydcs.dcs.unitgroup import StaticGroup
|
||||
from .airfields import RunwayData
|
||||
from .conflictgen import *
|
||||
from .naming import *
|
||||
|
||||
Reference in New Issue
Block a user