From 09e51b9a283ee077767c312b1c348b0333062b4c Mon Sep 17 00:00:00 2001 From: HobbitDur Date: Fri, 27 Dec 2024 14:12:55 +0100 Subject: [PATCH] Fixing Gamedata submodule --- .github/workflows/python-app.yml | 1 + IfritAI/command.py | 2 +- IfritAI/commandwidget.py | 2 +- IfritAI/ennemy.py | 4 ++-- IfritAI/ifritai.py | 6 +++--- IfritAI/ifritmanager.py | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 771ae7a..7be1879 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -49,6 +49,7 @@ jobs: cd IfritAI/ pyinstaller -n IfritAI -F --specpath release/build --distpath release --workpath release/build --onefile --icon=../../Resources/icon.ico main.py mkdir -p release/FF8GameData + mkdir OriginalFiles/ cp -R Resources release/ cp -R ../FF8GameData/Resources release/FF8GameData/ cd release diff --git a/IfritAI/command.py b/IfritAI/command.py index 44bc340..0a2c3c3 100644 --- a/IfritAI/command.py +++ b/IfritAI/command.py @@ -1,4 +1,4 @@ -from IfritEnhanced.FF8GameData.gamedata import GameData +from FF8GameData.gamedata import GameData class Command: diff --git a/IfritAI/commandwidget.py b/IfritAI/commandwidget.py index 14c741b..932f35e 100644 --- a/IfritAI/commandwidget.py +++ b/IfritAI/commandwidget.py @@ -1,7 +1,7 @@ from PyQt6.QtCore import QObject, pyqtSignal, QSignalBlocker from PyQt6.QtWidgets import QWidget, QHBoxLayout, QPushButton, QSpinBox, QFrame, QSizePolicy, QLabel, QComboBox -from IfritEnhanced.IfritAI.command import Command +from IfritAI.command import Command class OpIdChangedEmmiter(QObject): diff --git a/IfritAI/ennemy.py b/IfritAI/ennemy.py index 636ec82..d0e043f 100644 --- a/IfritAI/ennemy.py +++ b/IfritAI/ennemy.py @@ -1,8 +1,8 @@ import copy import os -from IfritEnhanced.FF8GameData.gamedata import GameData -from IfritEnhanced.IfritAI.command import Command +from FF8GameData.gamedata import GameData +from IfritAI.command import Command class Ennemy(): diff --git a/IfritAI/ifritai.py b/IfritAI/ifritai.py index 882cf3e..773be29 100644 --- a/IfritAI/ifritai.py +++ b/IfritAI/ifritai.py @@ -6,9 +6,9 @@ from PyQt6.QtWidgets import QVBoxLayout, QWidget, QScrollArea, QPushButton, QFileDialog, QComboBox, QHBoxLayout, QLabel, \ QColorDialog, QCheckBox -from IfritEnhanced.IfritAI.command import Command -from IfritEnhanced.IfritAI.commandwidget import CommandWidget -from IfritEnhanced.IfritAI.ifritmanager import IfritManager +from IfritAI.command import Command +from IfritAI.commandwidget import CommandWidget +from IfritAI.ifritmanager import IfritManager class IfritAI(QWidget): diff --git a/IfritAI/ifritmanager.py b/IfritAI/ifritmanager.py index 5ee1d1f..76af1d1 100644 --- a/IfritAI/ifritmanager.py +++ b/IfritAI/ifritmanager.py @@ -1,9 +1,9 @@ -from IfritEnhanced.FF8GameData.gamedata import GameData +from FF8GameData.gamedata import GameData from ennemy import Ennemy class IfritManager: def __init__(self): - self.game_data = GameData("FF8GameData") + self.game_data = GameData("../FF8GameData") self.game_data.load_all() self.ennemy = Ennemy(self.game_data) self.ai_data = []