Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJRG 2 <jrg2@ubuntu.(none)>2013-12-27 19:23:11 (GMT)
committer JRG 2 <jrg2@ubuntu.(none)>2013-12-27 19:23:11 (GMT)
commita2c33252caa224d75106508fd4a013552fdaec64 (patch)
treeac9e9171ea0289f76107f6f8e2d02f9182674e8e
parenta988bd96bff53ea5a3144985b6d7086c4eb7a959 (diff)
facesfaces
-rw-r--r--game.py2
-rw-r--r--player.py20
2 files changed, 21 insertions, 1 deletions
diff --git a/game.py b/game.py
index 50d2d6f..fa1faeb 100644
--- a/game.py
+++ b/game.py
@@ -468,7 +468,7 @@ class MazeGame:
pygame.mouse.set_cursor(a, b, c, d)
self.frame += 1
# process all queued events
- for event in pausescreen.get_events(sleep_timeout=30):
+ for event in pygame.event.get():
self.processEvent(event)
self.animate()
diff --git a/player.py b/player.py
index f9a3452..7865d89 100644
--- a/player.py
+++ b/player.py
@@ -54,12 +54,28 @@ class Player:
border = size / 10.
center = rect.inflate(-border * 2, - border * 2)
fg, bg = self.colors
+
+ eye = rect.inflate(-border*7.5, -border*7.5)
+ left_eye = eye.move(-border*1.5, -border)
+ right_eye = eye.move(border*1.5, -border)
+ mouth = rect.inflate(-border*6.5, -border*6.5)
+ mouth_fg = mouth.move(0, border)
+ mouth = mouth.inflate(border, 0)
+
if self.shape == 'circle':
pygame.draw.ellipse(screen, fg, rect, 0)
pygame.draw.ellipse(screen, bg, center, 0)
+ pygame.draw.ellipse(screen, fg, mouth_fg, 0)
+ pygame.draw.ellipse(screen, bg, mouth, 0)
+ pygame.draw.ellipse(screen, fg, left_eye, 0)
+ pygame.draw.ellipse(screen, fg, right_eye, 0)
elif self.shape == 'square':
pygame.draw.rect(screen, fg, rect, 0)
pygame.draw.rect(screen, bg, center, 0)
+ pygame.draw.ellipse(screen, fg, mouth_fg, 0)
+ pygame.draw.ellipse(screen, bg, mouth, 0)
+ pygame.draw.ellipse(screen, fg, left_eye, 0)
+ pygame.draw.ellipse(screen, fg, right_eye, 0)
elif self.shape == 'triangle':
rect = rect.inflate(-1, -1)
pts = [rect.bottomleft, rect.midtop, rect.bottomright]
@@ -68,6 +84,10 @@ class Player:
(pts[1][0], pts[1][1] + border * 2.236),
(pts[2][0] - border * 1.394, pts[2][1] - border)]
pygame.draw.polygon(screen, bg, pts, 0)
+ pygame.draw.ellipse(screen, fg, mouth_fg, 0)
+ pygame.draw.ellipse(screen, bg, mouth, 0)
+ pygame.draw.ellipse(screen, fg, left_eye, 0)
+ pygame.draw.ellipse(screen, fg, right_eye, 0)
def reset(self):
self.direction = (0, 0)