diff --git a/.gitignore b/.gitignore index 3531c981..c897feb3 100644 --- a/.gitignore +++ b/.gitignore @@ -181,5 +181,6 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk +# my venv environment +.bomberman # End of https://www.gitignore.io/api/linux,macos,python,pycharm,windows - diff --git a/Bomberman/game.py b/Bomberman/game.py index 9370d941..12b514bb 100644 --- a/Bomberman/game.py +++ b/Bomberman/game.py @@ -7,13 +7,13 @@ class Game: """Game class""" - def __init__(self, width, height, max_time, bomb_time, expl_duration, expl_range, sprite_dir="../../bomberman/sprites/"): + def __init__(self, width, height, max_time, bomb_time, expl_duration, expl_range, sprite_dir="../../Bomberman/sprites/"): self.world = RealWorld.from_params(width, height, max_time, bomb_time, expl_duration, expl_range) self.sprite_dir = sprite_dir self.load_gui(width, height) @classmethod - def fromfile(cls, fname, sprite_dir="../../bomberman/sprites/"): + def fromfile(cls, fname, sprite_dir="../../Bomberman/sprites/"): with open(fname, 'r') as fd: # First lines are parameters max_time = int(fd.readline().split()[1]) diff --git a/teamNN/interactivecharacter.py b/teamNN/interactivecharacter.py index cd1c4acd..8222ef09 100644 --- a/teamNN/interactivecharacter.py +++ b/teamNN/interactivecharacter.py @@ -1,8 +1,8 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../bomberman') +sys.path.insert(0, '../Bomberman') # Import necessary stuff -from entity import CharacterEntity +from entity import CharacterEntity # type: ignore from colorama import Fore, Back class InteractiveCharacter(CharacterEntity): diff --git a/teamNN/project1/variant1.py b/teamNN/project1/variant1.py index 54389be8..532b31e3 100644 --- a/teamNN/project1/variant1.py +++ b/teamNN/project1/variant1.py @@ -1,16 +1,16 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff -from game import Game +from game import Game # type: ignore # TODO This is your code! sys.path.insert(1, '../teamNN') # Uncomment this if you want the empty test character -#from testcharacter import TestCharacter +# from testcharacter import TestCharacter # Uncomment this if you want the interactive character from interactivecharacter import InteractiveCharacter @@ -35,7 +35,7 @@ # Run! # Use this if you want to press ENTER to continue at each step -# g.go(0) +#g.go(0) # Use this if you want to proceed automatically g.go(1) diff --git a/teamNN/project1/variant2.py b/teamNN/project1/variant2.py index 306f08e8..1825d671 100644 --- a/teamNN/project1/variant2.py +++ b/teamNN/project1/variant2.py @@ -1,6 +1,6 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff diff --git a/teamNN/project1/variant3.py b/teamNN/project1/variant3.py index 3d229181..b47d34ba 100644 --- a/teamNN/project1/variant3.py +++ b/teamNN/project1/variant3.py @@ -1,6 +1,6 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff diff --git a/teamNN/project1/variant4.py b/teamNN/project1/variant4.py index 81e4a631..9e33c7cb 100644 --- a/teamNN/project1/variant4.py +++ b/teamNN/project1/variant4.py @@ -1,6 +1,6 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff diff --git a/teamNN/project1/variant5.py b/teamNN/project1/variant5.py index 807d4942..31670927 100644 --- a/teamNN/project1/variant5.py +++ b/teamNN/project1/variant5.py @@ -1,6 +1,6 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff diff --git a/teamNN/project2/variant1.py b/teamNN/project2/variant1.py index 6d1d284c..459ac777 100644 --- a/teamNN/project2/variant1.py +++ b/teamNN/project2/variant1.py @@ -1,6 +1,6 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff diff --git a/teamNN/project2/variant2.py b/teamNN/project2/variant2.py index 306f08e8..1825d671 100644 --- a/teamNN/project2/variant2.py +++ b/teamNN/project2/variant2.py @@ -1,6 +1,6 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff diff --git a/teamNN/project2/variant3.py b/teamNN/project2/variant3.py index 3d229181..b47d34ba 100644 --- a/teamNN/project2/variant3.py +++ b/teamNN/project2/variant3.py @@ -1,6 +1,6 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff diff --git a/teamNN/project2/variant4.py b/teamNN/project2/variant4.py index 81e4a631..9e33c7cb 100644 --- a/teamNN/project2/variant4.py +++ b/teamNN/project2/variant4.py @@ -1,6 +1,6 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff diff --git a/teamNN/project2/variant5.py b/teamNN/project2/variant5.py index 96f1503b..eee88d81 100644 --- a/teamNN/project2/variant5.py +++ b/teamNN/project2/variant5.py @@ -1,6 +1,6 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../../bomberman') +sys.path.insert(0, '../../Bomberman') sys.path.insert(1, '..') # Import necessary stuff diff --git a/teamNN/testcharacter.py b/teamNN/testcharacter.py index 6f13216f..b9aa6b1e 100644 --- a/teamNN/testcharacter.py +++ b/teamNN/testcharacter.py @@ -1,8 +1,8 @@ # This is necessary to find the main code import sys -sys.path.insert(0, '../bomberman') +sys.path.insert(0, '../Bomberman') # Import necessary stuff -from entity import CharacterEntity +from entity import CharacterEntity # type: ignore from colorama import Fore, Back class TestCharacter(CharacterEntity):