Merge branch '8-convert-to-python-package' into 'master'

Update structure to package structure

Closes #8

See merge request !10

pythocup/__init__.py

+from .group import Team
+from .model import Side
+from .brain import Brain, FollowBall
+from .match import Match

pythocup/__main__.py

+from . import Team, Match, FollowBall
+
+def main():
+
+    empty_team = Team()
+
+    one_player_team = Team()
+    one_player_team.put(FollowBall, (100, 300))
+
+    match = Match()
+    match.play(one_player_team, empty_team)
+    print(match.get_score())
+
+    match.play(empty_team, one_player_team)
+    print(match.get_score())
+
+if __name__ == "__main__":
+    main()

pythocup/brain/__init__.py

+from .brain import Brain
+from .follow_ball import FollowBall

brain/brain.py → pythocup/brain/brain.py

 from abc import ABC, abstractmethod
-from model.object_type import ObjectType
-from model.cup_object import CupObject
+from ..model import ObjectType, CupObject, Side
 from pygame.math import Vector2
-from model.side import Side
 
 class Brain(ABC):
 

brain/follow_ball.py → pythocup/brain/follow_ball.py

-from brain.brain import Brain
+from ..brain import Brain
 from pygame.math import Vector2
 
 class FollowBall(Brain):

pythocup/group/__init__.py

+from .team import Team
+from .team_item import TeamItem
+from .team_goal import TeamGoal
+from .single_ball import SingleBall

group/single_ball.py → pythocup/group/single_ball.py

 from pygame.sprite import GroupSingle
-from sprite.ball import Ball
+from ..sprite import Ball
 
 class SingleBall(GroupSingle):
 

group/team.py → pythocup/group/team.py

 import pygame
-import config
-from sprite.player import Player
-from brain.brain import Brain
+from .. import config
+from ..sprite import Player
+from ..brain import Brain
 
 class Team(object):
 

group/team_goal.py → pythocup/group/team_goal.py

-from group.team_item import TeamItem
-from sprite.goal import Goal
+from .team_item import TeamItem
+from ..sprite import Goal
 
 class TeamGoal(TeamItem):
 

group/team_item.py → pythocup/group/team_item.py

 import pygame
-from model.side import Side
+from ..model import Side
 
 class TeamItem(pygame.sprite.Group):
 

pythocup.py → pythocup/match.py

 import pygame
-import config
-from group.team import Team
-from group.team_item import TeamItem
-from group.team_goal import TeamGoal
-from group.single_ball import SingleBall
-from model.side import Side
-from sprite.score import Score
-from brain.follow_ball import FollowBall
+from . import config
+from .group import Team, TeamItem, TeamGoal, SingleBall
+from .model import Side
+from .sprite import Score
+from .brain import FollowBall
 
 pygame.init()
 pygame.display.set_caption("Python Cup")
@@ -48,7 +45,7 @@ class Match(object):
             pygame.display.flip()
 
 
-    def check_events(self):        
+    def check_events(self):
         for event in pygame.event.get():
             if event.type == pygame.QUIT:
                 self.done = True
@@ -86,20 +83,3 @@ class Match(object):
         for score in self.score_board:
             data[score.side] = score.score
         return data
-
-def main():
-
-    empty_team = Team()
-
-    one_player_team = Team()
-    one_player_team.put(FollowBall, (100, 300))
-
-    match = Match()
-    match.play(one_player_team, empty_team)
-    print(match.get_score())
-
-    match.play(empty_team, one_player_team)
-    print(match.get_score())
-
-if __name__ == "__main__":
-    main()

pythocup/model/__init__.py

+from .cup_object import CupObject
+from .object_type import ObjectType
+from .side import Side

model/cup_object.py → pythocup/model/cup_object.py

 from pygame.math import Vector2
-from model.side import Side
+from .side import Side
 
 class CupObject():
 

pythocup/sprite/__init__.py

+from .player import Player
+from .ball import Ball
+from .goal import Goal
+from .score import Score

sprite/ball.py → pythocup/sprite/ball.py

 import pygame
-import config
-import sprite.round_sprite as rs
+from .. import config
+from . import round_sprite as rs
 
 class Ball(rs.Round):
 

sprite/goal.py → pythocup/sprite/goal.py

 import pygame
-import config
-from model.side import Side
+from .. import config
+from ..model import Side
 
 class Goal(pygame.sprite.Sprite):
 

sprite/player.py → pythocup/sprite/player.py

 import pygame
-import config
-import sprite.round_sprite as rs
-from model.side import Side
+from .. import config
+from . import round_sprite as rs
+from ..model import Side
 
 class Player(rs.Round):
 

sprite/score.py → pythocup/sprite/score.py

 import pygame
-from model.side import Side
+from ..model import Side
 
 pygame.font.init()
 

sample.py

-from pythocup import Match
-from group.team import Team
-from model.side import Side
-from brain.follow_ball import FollowBall
-
+from pythocup import Team, Match, FollowBall
 
 def main():
 

sample_brain.py

+from pythocup import Team, Match, Brain, FollowBall
+from pygame.math import Vector2
+
+class GoToBall(Brain):
+
+    def action(self):
+        move = self.ball.pos - self.pos
+        return move, Vector2(0,0)
+
+
+def main():
+
+    team_a = Team()
+    team_a.put(GoToBall, (100, 250))
+
+    team_b = Team()
+    # team_b.put(FollowBall, (100, 250))
+
+    match = Match()
+    match.play(team_a, team_b)
+    print(match.get_score())
+
+if __name__ == "__main__":
+    main()