Merge lp:~alecu/quickly/desktopcouch-scores into lp:quickly

[Alejandro J. Cura]

Save hiscores in desktopcouch, and show them while waiting for the game to start.

Save hiscores in desktopcouch, and show them while waiting for the game to start.

[Rick Spencer (rick-rickspencer3)]

Code looked good and worked well. Thanks for the excellent contribution!

review: Approve

=== modified file 'data/templates/ubuntu-pygame/help/tutorial.xml'
--- data/templates/ubuntu-pygame/help/tutorial.xml	2010-10-06 10:03:59 +0000
+++ data/templates/ubuntu-pygame/help/tutorial.xml	2011-02-21 06:26:17 +0000
@@ -529,8 +529,8 @@
 <listitem>The default explosions are crayon drawings, they don't fit in much with the look of the game. Perhaps some new images for the explosion stages would be good.</listitem>
 <listitem>There are no power ups! You could create power up classes the derive from BaseSprite to give the guy extra powers, like bigger bullets, more bullets, or extra lives.</listitem>
 <listitem>More special enemies, for example you could use the HomingMissle class to create harder to kill enemies.</listitem>
-<listitem>There is no high scores list. You could use desktopcouch to store high scores and use the code in view_tick to see how to present the scores.</listitem>
+<listitem>The high score list is stored in desktopcouch, so it will sync with your other computers. But it will have to be adjusted to the size we set for the window, and perhaps you can also let the player choose the name that's stored.</listitem>
 </itemizedlist>
 </para>
 </chapter>
-</book>
\ No newline at end of file
+</book>

=== modified file 'data/templates/ubuntu-pygame/project_root/bin/project_name'
--- data/templates/ubuntu-pygame/project_root/bin/project_name	2010-12-04 17:25:06 +0000
+++ data/templates/ubuntu-pygame/project_root/bin/project_name	2011-02-21 06:26:17 +0000
@@ -17,6 +17,7 @@
 from python_name.enemy import Enemy
 from python_name.homingmissle import HomingMissle
 from python_name.game import Game
+from python_name import hiscores
 import python_name.python_nameconfig
 
 #set up translations
@@ -50,11 +51,12 @@
 g = Guy(bullets)
 guys.add(g)
 
-#set up the game over screen, center is by default
-gov = BaseSprite(python_name.python_nameconfig.game_over_background)
-gov.x = (sw - gov.rect.width)/2
-gov.y = (sh - gov.rect.height)/2
-gov.update()
+def update_hiscore_screen():
+    """Update the hiscore screen."""
+    hiscores_size = python_name.python_nameconfig.hiscores_size
+    hiscores.screen = hiscores.hiscores_screen(hiscores_size)
+    screen_center = screen.get_rect().center
+    hiscores.pos = hiscores.screen.get_rect(center=screen_center)
 
 def next_level():
     """next_level - go to the next game level
@@ -94,6 +96,10 @@
     #handle starting the game or quiting the game if the game
     #is over or has not started
     if game.lives < 1:
+        if game.playing:
+            game.playing = False
+            hiscores.save_score(game.score, game.level)
+            update_hiscore_screen()
         for event in pygame.event.get():
             if event.type == pygame.KEYDOWN:
                 if event.key == pygame.K_ESCAPE:
@@ -185,8 +191,9 @@
     screen.blit(scoretxt, scorepos)
     screen.blit(leveltxt, levelpos)
     screen.blit(livestxt, livespos)
-    if game.lives < 1:
-        screen.blit(gov.image,gov.rect)
+    if not game.playing:
+        screen.blit(hiscores.screen, hiscores.pos)
+
 
     #now show the new drawing
     pygame.display.flip()
@@ -223,6 +230,7 @@
 
     """
 
+    update_hiscore_screen()
     while 1:
         #set the clock to tick 15 times per second
         clock.tick(15)

=== modified file 'data/templates/ubuntu-pygame/project_root/python/game.py'
--- data/templates/ubuntu-pygame/project_root/python/game.py	2010-12-04 17:25:06 +0000
+++ data/templates/ubuntu-pygame/project_root/python/game.py	2011-02-21 06:26:17 +0000
@@ -26,6 +26,7 @@
         self.free_guy_at = 10
         self.free_guy_sound = pygame.mixer.Sound(python_nameconfig.free_guy_sound)
         self.paused = False
+        self.playing = False
 
     def add_free_guy(self):
         """add_free_guy - increments the game's lives by 1 and plays a sound.
@@ -52,6 +53,7 @@
 
     def reset(self):
         """reset - reset or start the game"""
+        self.playing = True
         self.level = 0
         self.lives = 5
         self.score = 0

=== added file 'data/templates/ubuntu-pygame/project_root/python/hiscores.py'
--- data/templates/ubuntu-pygame/project_root/python/hiscores.py	1970-01-01 00:00:00 +0000
+++ data/templates/ubuntu-pygame/project_root/python/hiscores.py	2011-02-21 06:26:17 +0000
@@ -0,0 +1,81 @@
+import getpass
+import operator
+import time
+import pwd
+import pygame
+
+from datetime import datetime
+from desktopcouch.records.server import CouchDatabase
+from desktopcouch.records.record import Record
+
+DARK_GRAY = (68, 47, 47)
+LIGHT_GRAY = (200, 180, 180)
+WHITE = (255, 255, 255)
+SCORE_RECORD_TYPE = 'https://wiki.ubuntu.com/GamesIntegration/HighScore'
+
+pygame.font.init()
+font = pygame.font.Font(None, 24)
+couchdb = CouchDatabase("python_name", create=True)
+
+def get_user_fullname():
+    """Return the name of the current user."""
+    username = getpass.getuser()
+    fullname = pwd.getpwnam(username).pw_gecos.split(",")[0]
+    return fullname if len(fullname) > 0 else username
+
+def add_dummy_scores():
+    """Add some dummy scores to the database."""
+    names = "Vince Noir|Naboo the Enigma|Bollo was Here|Bob Fossil|Howard Moon"
+    level = 4
+    for name in reversed(names.split("|")):
+        save_score(level ** 2, level, name)
+        level *= 2
+
+def get_hiscores(top=10):
+    """Return the sorted list of scores."""
+    all_scores = couchdb.get_all_records(record_type=SCORE_RECORD_TYPE)
+    if len(all_scores) == 0:
+        add_dummy_scores()
+        all_scores = couchdb.get_all_records(record_type=SCORE_RECORD_TYPE)
+    sort_key = operator.itemgetter("score", "timestamp")
+    sorted_scores = sorted(all_scores, key=sort_key, reverse=True)
+    return sorted_scores[:top]
+
+def save_score(score, level, player=get_user_fullname()):
+    """Save the score in the couch database."""
+    data = {
+        "player": player,
+        "level": level,
+        "score": score,
+        "timestamp": time.time(),
+    }
+    record = Record(data, record_type=SCORE_RECORD_TYPE)
+    couchdb.put_record(record)
+
+def hiscores_screen(screen_size, message="Press Enter to Start"):
+    """A pygame surface with the hiscore board and start message."""
+    screen = pygame.Surface(screen_size)
+    screen.fill(DARK_GRAY)
+    screen_rect = screen.get_rect()
+    centerx = screen_rect.centerx
+    line_size = font.get_linesize()
+
+    y = line_size
+    msg = font.render("Highest Scores", 1, WHITE)
+    msg_top = screen_rect.bottom - line_size
+    screen.blit(msg, msg.get_rect(centerx=centerx, top=y))
+    y += line_size * 2
+
+    hiscores = get_hiscores(top=10)
+    scoreboard_centerx = centerx * 0.83
+    for score in hiscores:
+        msg = font.render(str(score["score"]) + " - ", 1, LIGHT_GRAY)
+        screen.blit(msg, msg.get_rect(right=scoreboard_centerx, top=y))
+        msg = font.render(score["player"], 1, LIGHT_GRAY)
+        screen.blit(msg, msg.get_rect(left=scoreboard_centerx, top=y))
+        y += line_size
+
+    msg = font.render(message, 1, WHITE)
+    msg_bottom = screen_rect.bottom - line_size
+    screen.blit(msg, msg.get_rect(centerx=centerx, bottom=msg_bottom))
+    return screen

=== modified file 'data/templates/ubuntu-pygame/project_root/python/python_nameconfig.py'
--- data/templates/ubuntu-pygame/project_root/python/python_nameconfig.py	2010-12-04 17:25:06 +0000
+++ data/templates/ubuntu-pygame/project_root/python/python_nameconfig.py	2011-02-21 06:26:17 +0000
@@ -31,6 +31,8 @@
 screen_width = 800
 screen_height = 480
 
+hiscores_size = (620, 300)
+
 #images
 image_path = os.path.join(getdatapath(), "media/")
 

=== modified file 'data/templates/ubuntu-pygame/test/filelist.sh'
--- data/templates/ubuntu-pygame/test/filelist.sh	2010-12-04 17:25:06 +0000
+++ data/templates/ubuntu-pygame/test/filelist.sh	2011-02-21 06:26:17 +0000
@@ -51,5 +51,6 @@
 # test_project/enemy.py
 # test_project/game.py
 # test_project/guy.py
+# test_project/hiscores.py
 # test_project/homingmissle.py
 # test_project/test_projectconfig.py