Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 2 additions & 2 deletions Bomberman/game.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
4 changes: 2 additions & 2 deletions teamNN/interactivecharacter.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
8 changes: 4 additions & 4 deletions teamNN/project1/variant1.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
2 changes: 1 addition & 1 deletion teamNN/project1/variant2.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion teamNN/project1/variant3.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion teamNN/project1/variant4.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion teamNN/project1/variant5.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion teamNN/project2/variant1.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion teamNN/project2/variant2.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion teamNN/project2/variant3.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion teamNN/project2/variant4.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion teamNN/project2/variant5.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions teamNN/testcharacter.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down