mirror of
https://github.com/dcs-retribution/dcs-retribution.git
synced 2025-11-10 15:41:24 +00:00
Removed incorrect imports causing pydcs being imported twice;
This commit is contained in:
parent
2969ce2d56
commit
3c96c1d5b1
@ -1,5 +1,5 @@
|
|||||||
import inspect
|
import inspect
|
||||||
from pydcs import dcs
|
import dcs
|
||||||
|
|
||||||
DEFAULT_AVAILABLE_BUILDINGS = ['fuel', 'ammo', 'comms', 'oil', 'ware', 'farp', 'fob', 'power', 'factory', 'derrick', 'aa']
|
DEFAULT_AVAILABLE_BUILDINGS = ['fuel', 'ammo', 'comms', 'oil', 'ware', 'farp', 'fob', 'power', 'factory', 'derrick', 'aa']
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import logging
|
import logging
|
||||||
import typing
|
import typing
|
||||||
import pdb
|
import pdb
|
||||||
from pydcs import dcs
|
import dcs
|
||||||
|
|
||||||
from random import randint
|
from random import randint
|
||||||
from dcs import Mission
|
from dcs import Mission
|
||||||
|
|||||||
@ -4,7 +4,7 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from pydcs import dcs
|
import dcs
|
||||||
from PySide2 import QtWidgets
|
from PySide2 import QtWidgets
|
||||||
from PySide2.QtGui import QPixmap
|
from PySide2.QtGui import QPixmap
|
||||||
from PySide2.QtWidgets import QApplication, QSplashScreen
|
from PySide2.QtWidgets import QApplication, QSplashScreen
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
from pydcs import dcs
|
import dcs
|
||||||
|
|
||||||
from game import db
|
from game import db
|
||||||
from gen.aircraft import AircraftConflictGenerator
|
from gen.aircraft import AircraftConflictGenerator
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import typing
|
import typing
|
||||||
|
|
||||||
from pydcs import dcs
|
import dcs
|
||||||
from dcs.mapping import Point
|
from dcs.mapping import Point
|
||||||
|
|
||||||
from .controlpoint import ControlPoint
|
from .controlpoint import ControlPoint
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import json
|
|||||||
import os
|
import os
|
||||||
from shutil import copyfile
|
from shutil import copyfile
|
||||||
|
|
||||||
from pydcs import dcs
|
import dcs
|
||||||
|
|
||||||
from userdata import persistency
|
from userdata import persistency
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user