renamed data directory to pocket_friends to avoid conflict

This commit is contained in:
Nick Dyer 2021-05-29 18:46:24 -04:00
parent 41283bd221
commit 329c4a022c
9 changed files with 8 additions and 8 deletions

View File

@ -3,8 +3,8 @@ Launch script for Pocket Friends.
"""
import pygame
import sys
from data.game import main as game_main
from data.development.dev_menu import main as dev_menu_main
from pocket_friends.game import main as game_main
from pocket_friends.development.dev_menu import main as dev_menu_main
enable_dev = False

View File

@ -1,7 +1,7 @@
"""
Development menu for the game on Raspberry Pi. NOTE: THIS DOES NOTHING ON A COMPUTER!
"""
import data.game
import pocket_friends.game
import importlib.util
import os
import pygame
@ -16,7 +16,7 @@ try:
importlib.util.find_spec('RPi.GPIO')
import RPi.GPIO as GPIO
except ImportError:
import data.development.FakeGPIO as GPIO
import pocket_friends.development.FakeGPIO as GPIO
# Global variable to keep track of the current menu.
menu = 'main'
@ -43,7 +43,7 @@ def start_game():
Cleans the GPIO and starts the game.
"""
GPIOHandler.teardown()
data.game.main()
pocket_friends.game.main()
pygame.quit()
GPIOHandler.setup()
@ -95,7 +95,7 @@ def main():
# The following defines all of the options in the various different menus.
main_menu = Menu('Pocket Friends Dev Menu {0}\nGame Version {1}'.format(dev_version, data.game.version))
main_menu = Menu('Pocket Friends Dev Menu {0}\nGame Version {1}'.format(dev_version, pocket_friends.game.version))
main_menu.add_option(Menu.Option('Start Game', start_game))
main_menu.add_option(Menu.Option('Button Test', run_button_test))
main_menu.add_option(Menu.Option('Restart Dev Menu', quit_with_error))

View File

@ -108,7 +108,7 @@ try:
importlib.util.find_spec('RPi.GPIO')
import RPi.GPIO as GPIO
except ImportError:
import data.development.FakeGPIO as GPIO
import pocket_friends.development.FakeGPIO as GPIO
def game():

View File

@ -8,7 +8,7 @@ try:
importlib.util.find_spec('RPi.GPIO')
import RPi.GPIO as GPIO
except ImportError:
import data.development.FakeGPIO as GPIO
import pocket_friends.development.FakeGPIO as GPIO
class Constants: