Remove the userdata package.

game/event/event.py

@@ -1,25 +1,13 @@
-import typing
-import logging
-
-from dcs.action import Coalition
-from dcs.unittype import UnitType
-from dcs.task import *
-from dcs.vehicles import AirDefence
 from dcs.unittype import UnitType
 
 from game import *
+from game import persistency
+from game.debriefing import Debriefing
 from game.infos.information import Information
-from theater import *
 from gen.environmentgen import EnvironmentSettings
-from gen.conflictgen import Conflict
-from game.db import assigned_units_from, unitdict_from
+from theater import *
 from theater.start_generator import generate_airbase_defense_group
 
-from userdata.debriefing import Debriefing
-from userdata import persistency
-
-import game.db as db
-
 DIFFICULTY_LOG_BASE = 1.1
 EVENT_DEPARTURE_MAX_DISTANCE = 340000
 
@@ -28,6 +16,7 @@ MINOR_DEFEAT_INFLUENCE = 0.1
 DEFEAT_INFLUENCE = 0.3
 STRONG_DEFEAT_INFLUENCE = 0.5
 
+
 class Event:
     silent = False
     informational = False

game/event/frontlineattack.py

@@ -1,6 +1,6 @@
 from game.event import *
 from game.operation.frontlineattack import FrontlineAttackOperation
-from userdata.debriefing import Debriefing
+from ..debriefing import Debriefing
 
 
 class FrontlineAttackEvent(Event):

game/game.py

@@ -4,6 +4,7 @@ from game.db import REWARDS, PLAYER_BUDGET_BASE, sys
 from game.inventory import GlobalAircraftInventory
 from game.models.game_stats import GameStats
 from gen.ato import AirTaskingOrder
+from gen.conflictgen import Conflict
 from gen.flights.ai_flight_planner import CoalitionMissionPlanner
 from gen.flights.closestairfields import ObjectiveDistanceCache
 from gen.ground_forces.ai_ground_planner import GroundPlanner

game/operation/operation.py

@@ -8,7 +8,7 @@ from gen.tacan import TacanRegistry
 from dcs.countries import country_dict
 from dcs.lua.parse import loads
 from dcs.terrain.terrain import Terrain
-from userdata.debriefing import *
+from ..debriefing import Debriefing
 
 
 class Operation:

qt_ui/liberation_install.py

@@ -4,13 +4,14 @@ from shutil import copyfile
 
 import dcs
 
-from userdata import persistency
+from game import persistency
 
 global __dcs_saved_game_directory
 global __dcs_installation_directory
 
 PREFERENCES_FILE_PATH = "liberation_preferences.json"
 
+
 def init():
     global __dcs_saved_game_directory
     global __dcs_installation_directory

qt_ui/liberation_theme.py

@@ -1,7 +1,6 @@
 import json
 import os
-
-import qt_ui.uiconstants as CONST
+from typing import Dict
 
 global __theme_index
 
@@ -10,6 +9,21 @@ THEME_PREFERENCES_FILE_PATH = "liberation_theme.json"
 DEFAULT_THEME_INDEX = 1
 
 
+# new themes can be added here
+THEMES: Dict[int, Dict[str, str]] = {
+    0: {'themeName': 'Vanilla',
+        'themeFile': 'windows-style.css',
+        'themeIcons': 'medium',
+        },
+
+    1: {'themeName': 'DCS World',
+        'themeFile': 'style-dcs.css',
+        'themeIcons': 'light',
+        },
+
+}
+
+
 def init():
     global __theme_index
 
@@ -49,19 +63,19 @@ def get_theme_index():
 
 # get theme name based on current index
 def get_theme_name():
-    theme_name = CONST.THEMES[get_theme_index()]['themeName']
+    theme_name = THEMES[get_theme_index()]['themeName']
     return theme_name
 
 
 # get theme icon sub-folder name based on current index
 def get_theme_icons():
-    theme_icons = CONST.THEMES[get_theme_index()]['themeIcons']
+    theme_icons = THEMES[get_theme_index()]['themeIcons']
     return str(theme_icons)
 
 
 # get theme stylesheet css based on current index
 def get_theme_css_file():
-    theme_file = CONST.THEMES[get_theme_index()]['themeFile']
+    theme_file = THEMES[get_theme_index()]['themeFile']
     return str(theme_file)
 
 

qt_ui/main.py

@@ -1,5 +1,3 @@
-from userdata import logging_config
-
 import logging
 import os
 import sys
@@ -9,11 +7,17 @@ from PySide2 import QtWidgets
 from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QApplication, QSplashScreen
 
-from qt_ui import uiconstants
+from game import persistency
+from qt_ui import (
+    liberation_install,
+    liberation_theme,
+    logging_config,
+    uiconstants,
+)
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from qt_ui.windows.QLiberationWindow import QLiberationWindow
-from qt_ui.windows.preferences.QLiberationFirstStartWindow import QLiberationFirstStartWindow
-from userdata import liberation_install, persistency, liberation_theme
+from qt_ui.windows.preferences.QLiberationFirstStartWindow import \
+    QLiberationFirstStartWindow
 
 # Logging setup
 logging_config.init_logging(uiconstants.VERSION_STRING)

qt_ui/uiconstants.py

@@ -1,12 +1,10 @@
-# URL for UI links
 import os
 from typing import Dict
 
 from PySide2.QtGui import QColor, QFont, QPixmap
 
-from game.event import UnitsDeliveryEvent, FrontlineAttackEvent
 from theater.theatergroundobject import CATEGORY_MAP
-from userdata.liberation_theme import get_theme_icons
+from .liberation_theme import get_theme_icons
 
 VERSION_STRING = "2.1.4"
 
@@ -28,20 +26,6 @@ FONT_PRIMARY_I = QFont(FONT_NAME, FONT_SIZE, weight=5, italic=True)
 FONT_PRIMARY_B = QFont(FONT_NAME, FONT_SIZE, weight=75, italic=False)
 FONT_MAP = QFont(FONT_NAME, 10, weight=75, italic=False)
 
-# new themes can be added here
-THEMES: Dict[int, Dict[str, str]] = {
-    0: {'themeName': 'Vanilla',
-        'themeFile': 'windows-style.css',
-        'themeIcons': 'medium',
-        },
-
-    1: {'themeName': 'DCS World',
-        'themeFile': 'style-dcs.css',
-        'themeIcons': 'light',
-        },
-
-}
-
 COLORS: Dict[str, QColor] = {
     "white": QColor(255, 255, 255),
     "white_transparent": QColor(255, 255, 255, 35),

qt_ui/windows/QDebriefingWindow.py

@@ -1,8 +1,15 @@
 from PySide2.QtGui import QIcon, QPixmap
-from PySide2.QtWidgets import QLabel, QDialog, QVBoxLayout, QGroupBox, QGridLayout, QPushButton
+from PySide2.QtWidgets import (
+    QDialog,
+    QGridLayout,
+    QGroupBox,
+    QLabel,
+    QPushButton,
+    QVBoxLayout,
+)
 
-from game.game import Event, db, Game
-from userdata.debriefing import Debriefing
+from game.debriefing import Debriefing
+from game.game import Event, Game, db
 
 
 class QDebriefingWindow(QDialog):

qt_ui/windows/QLiberationWindow.py

@@ -17,8 +17,7 @@ from PySide2.QtWidgets import (
 )
 
 import qt_ui.uiconstants as CONST
-from game import Game
-from game.inventory import GlobalAircraftInventory
+from game import Game, persistency
 from qt_ui.dialogs import Dialog
 from qt_ui.models import GameModel
 from qt_ui.uiconstants import URLS
@@ -31,7 +30,6 @@ from qt_ui.windows.infos.QInfoPanel import QInfoPanel
 from qt_ui.windows.newgame.QNewGameWizard import NewGameWizard
 from qt_ui.windows.preferences.QLiberationPreferencesWindow import \
     QLiberationPreferencesWindow
-from userdata import persistency
 
 
 class QLiberationWindow(QMainWindow):

qt_ui/windows/QWaitingForMissionResultWindow.py

@@ -2,15 +2,24 @@ import json
 import os
 
 from PySide2 import QtCore
-from PySide2.QtCore import QObject, Signal, Qt
-from PySide2.QtGui import QMovie, QIcon, QPixmap
-from PySide2.QtWidgets import QLabel, QDialog, QGroupBox, QGridLayout, QPushButton, QFileDialog, QMessageBox, QTextEdit, \
-    QHBoxLayout
+from PySide2.QtCore import QObject, Qt, Signal
+from PySide2.QtGui import QIcon, QMovie, QPixmap
+from PySide2.QtWidgets import (
+    QDialog,
+    QFileDialog,
+    QGridLayout,
+    QGroupBox,
+    QHBoxLayout,
+    QLabel,
+    QMessageBox,
+    QPushButton,
+    QTextEdit,
+)
 
+from game.debriefing import Debriefing, wait_for_debriefing
 from game.game import Event, Game, logging
+from game.persistency import base_path
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
-from userdata.debriefing import wait_for_debriefing, Debriefing
-from userdata.persistency import base_path
 
 
 class DebriefingFileWrittenSignal(QObject):

qt_ui/windows/preferences/QLiberationPreferences.py

@@ -1,16 +1,21 @@
 import os
 
-from PySide2 import QtWidgets
-from PySide2.QtCore import QFile
 from PySide2.QtGui import Qt
-from PySide2.QtWidgets import QFrame, QLineEdit, QGridLayout, QVBoxLayout, QLabel, QPushButton, \
-    QFileDialog, QMessageBox, QDialog, QComboBox, QApplication
-import qt_ui.uiconstants as CONST
-import sys
+from PySide2.QtWidgets import (
+    QComboBox,
+    QFileDialog,
+    QFrame,
+    QGridLayout,
+    QLabel,
+    QLineEdit,
+    QMessageBox,
+    QPushButton,
+    QVBoxLayout,
+)
 
-import userdata
-from userdata import liberation_install, liberation_theme
-from userdata.liberation_theme import get_theme_index, set_theme_index
+import qt_ui.uiconstants as CONST
+from qt_ui import liberation_install, liberation_theme
+from qt_ui.liberation_theme import get_theme_index, set_theme_index
 
 
 class QLiberationPreferences(QFrame):

userdata/state.py

@@ -1,10 +0,0 @@
-
-
-class RunningMissionState:
-
-    killed_aircrafts = []
-    killed_ground_units = []
-    weapons_fired = []
-
-    def __init__(self):
-        pass