From f9025ba4805b0c9e3e7a5dfdfaa479b852cf666b Mon Sep 17 00:00:00 2001
From: Arthur 'Grizzly' Grisel-Davy <grisel-davy@crans.org>
Date: Sat, 28 Mar 2020 15:56:52 -0400
Subject: [PATCH] debut de definition des models et deux personnages

---
 .gitignore |  4 ++++
 main.py    | 36 ++++++++++++------------------------
 models.py  | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 models.py

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..793f937
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*__.py
+__pycache__/*
+*.swp
+*.pyc
diff --git a/main.py b/main.py
index a783c2f..e3a4bdc 100644
--- a/main.py
+++ b/main.py
@@ -4,10 +4,12 @@
 ### Author: Arthur 'Grizzly' Grisel-Davy
 
 import pygame
+
+from models import perso
 pygame.init()
 
 
-screen_width = 800
+screen_width = 1200
 screen_height = 800
 screen = pygame.display.set_mode((screen_width, screen_height))
 done = False
@@ -16,13 +18,10 @@ done = False
 BACKGROUND=(0,0,0)
 WHITE=(255,255,255)
 BLUE=(0,0,255)
+RED=(255,0,0)
 
-posx = 400
-posy = 400
-width=50
-height=50
-
-pygame.draw.rect(screen,BLUE,(posx,posy,width,height))
+perso1 = perso('Alice',200,200,50,50,RED,pygame.K_o,pygame.K_l,pygame.K_k,pygame.K_m)
+perso2 = perso('Bjorn',600,600,50,50,BLUE,pygame.K_z,pygame.K_s,pygame.K_q,pygame.K_d)
 
 speed = 1
 
@@ -32,23 +31,12 @@ while not done:
                         done = True
 
         keystate = pygame.key.get_pressed()
-        if keystate[pygame.K_LEFT]:
-            posx -= speed
-            if posx <0:
-            	posx=0
-        if keystate[pygame.K_RIGHT]:
-            posx += speed
-            if posx+width > screen_width:
-            	posx = screen_height-width
-        if keystate[pygame.K_UP]:
-            posy -= speed
-            if posy < 0:
-            	posy = 0
-        if keystate[pygame.K_DOWN]:
-            posy += speed
-            if posy+height > screen_height:
-            	posy = screen_height-height
+
+        perso1.check_move(keystate,screen_width,screen_height,speed)
+        perso2.check_move(keystate,screen_width,screen_height,speed)
+
 
         screen.fill(BACKGROUND)
-        pygame.draw.rect(screen,BLUE,(posx,posy,width,height))
+        perso1.draw(screen)
+        perso2.draw(screen)
         pygame.display.flip()
\ No newline at end of file
diff --git a/models.py b/models.py
new file mode 100644
index 0000000..e15065d
--- /dev/null
+++ b/models.py
@@ -0,0 +1,41 @@
+# -*- coding: UTF-8 -*-
+
+### Tangled Mind
+### Author: Arthur 'Grizzly' Grisel-Davy
+
+import pygame
+
+class perso():
+
+    def __init__(self,name,posx,posy,width,height,color,key_up,key_down,key_left,key_right):
+        self.name = name
+        self.posx = posx
+        self.posy = posy
+        self.key_up = key_up
+        self.key_down = key_down
+        self.key_left = key_left
+        self.key_right = key_right
+        self.width = width
+        self.height = height
+        self.color = color
+
+    def check_move(self,keystate,screen_width,screen_height,speed):
+        if keystate[self.key_left]:
+            self.posx -= speed
+            if self.posx <0:
+                self.posx=0
+        if keystate[self.key_right]:
+            self.posx += speed
+            if self.posx+self.width > screen_width:
+                self.posx = screen_width-self.width
+        if keystate[self.key_up]:
+            self.posy -= speed
+            if self.posy < 0:
+                self.posy = 0
+        if keystate[self.key_down]:
+            self.posy += speed
+            if self.posy+self.height > screen_height:
+                self.posy = screen_height-self.height
+
+    def draw(self,surface):
+        pygame.draw.rect(surface,self.color,(self.posx,self.posy,self.width,self.height))
\ No newline at end of file