Some minor graphics work

sfucmpt105-beta · Apr 1, 2013 · f845214 · f845214
1 parent 64b1885
commit f845214
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/risk/graphics/assets/base.py b/risk/graphics/assets/base.py
@@ -10,6 +10,7 @@
 YELLOW = (204, 204, 0)
 PURPLE = (102, 0, 102)
 ORANGE = (204, 102, 0)
+LIGHT_BROWN = (238, 223, 204)
 
 class PicassoAsset(Surface):
     def __init__(self, surface, x, y):

diff --git a/risk/graphics/assets/image.py b/risk/graphics/assets/image.py
@@ -5,10 +5,11 @@
 
 class ImageAsset(PicassoAsset):
     def __init__(self, x, y, path, scale_x=1.0, scale_y=1.0):
-        self.path = path
-        self.surface = pygame.image.load(path).convert_alpha()
-        if scale_x != 1 or scale_y != 1:
-            self.surface = pygame.transform.scale(self.surface, 
-                (int(self.surface.get_width() * scale_x),
-                int(self.surface.get_height() * scale_y)))
-        PicassoAsset.__init__(self, self.surface, x, y)
+        pass
+        #self.path = path
+        #self.surface = pygame.image.load(path).convert_alpha()
+        #if scale_x != 1 or scale_y != 1:
+        #    self.surface = pygame.transform.scale(self.surface, 
+        #        (int(self.surface.get_width() * scale_x),
+        #        int(self.surface.get_height() * scale_y)))
+        #PicassoAsset.__init__(self, self.surface, x, y)
diff --git a/risk/graphics/graphics.py b/risk/graphics/graphics.py
@@ -144,7 +144,7 @@ def initialize_other_graphic_assets(picasso, game_master):
 def add_buttons(picasso):
     datastore = Datastore()
     next_button = assets.clickable.ClickableAsset(
-        1000, 500, 100, 100, 'NEXT')
+        1000, 635, 120, 65, 'NEXT')
     datastore.add_entry('next', next_button, 'buttons')
 
     for button in datastore.get_storage('buttons').values():
@@ -154,7 +154,7 @@ def add_overlay(picasso):
     datastore = Datastore()
     overlay = assets.image.ImageAsset(0, 0, DEFAULT_OVERLAY)
     datastore.add_entry('overlay', overlay)
-    picasso.add_asset('999_overlay', overlay)
+    #picasso.add_asset('0_overlay', overlay)
 
 def show_human_player(game_master):
     layer = 3