im sam and im a dummyhead

sgoodspeed · Apr 30, 2012 · 0870d5a · 0870d5a
1 parent f89cd32
commit 0870d5a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/core/collisions.py b/core/collisions.py
@@ -32,5 +32,6 @@ def collisionCheck(game,player,level):
     if player.sprite.doorChange:
         for door, player in groupcollide(level.doors, player, False, False).items():
          game.nextLevel = door.nextLevel
+         door.open()
          game.changing = True
 
diff --git a/core/level.py b/core/level.py
@@ -56,8 +56,7 @@ def clean(self):
         if not self.cleaned:
             self.cleaned = True
             self.image = self.cleanImage        
-
-
+
 
 ## Tilesheet class
 class TileSheet(object):
@@ -82,8 +81,8 @@ def render(self, data):
         solidTileGroup = Group()
         dirtyTileGroup = Group()
         doorGroup = Group()
-
-
+        doorImage = self.tilemap.get(DOOR)
+        openImage = self.tilemap.get(OPENDOOR)
         # Loop through the .lvl file
         for y, row in enumerate(data):
             tileOffset = 0
@@ -102,10 +101,12 @@ def render(self, data):
                         tile = DirtyTile(tileImage, cleanImage, x*self.w-tileOffset, y*self.h, cell) # We need to assign a secondary image here where it says tileImage the second time that will display when it's cleaned
                         dirtyTileGroup.add(tile)
                     else:
-                        if cell == "o": # o = door
+                        if cell == DOOR: # o = door
                             nextLevel = row[x+1]
-                            door = Door(nextLevel, (x*self.w-tileOffset, y*self.h))
+                            door = Door(nextLevel, (x*self.w-tileOffset, y*self.h),doorImage,openImage)
                             doorGroup.add(door)
+
+
                         tile = Tile(tileImage, isSolid, x*self.w-tileOffset, y*self.h, cell)
                     if isSolid:
                         solidTileGroup.add(tile)

diff --git a/core/settings.py b/core/settings.py
@@ -11,8 +11,10 @@
                     ".": (192,96),
                     "&": (32,32),
                     "o": (0,0),
+                    "D": (50,55),
                     ",": (69,69),
-                    "CLEAN1": (96,96)
+                    "CLEAN1": (96,96),
+                    "OPENDOOR": (40,40)
                     }
 TILE_SOLIDS = [ ".", 
                 "&", 
@@ -24,6 +26,9 @@
 
 DIRTY_TILES_CLEAN = {",": "CLEAN1"}
 
+DOOR = "o"
+OPENDOOR = "D"
+
 ### PLAYER
 PLAYER_SIZE = PLY_W, PLY_H = T_W, T_H*2.2
 PLAYER_START = PLAYER_START_X, PLAYER_START_Y = 100, 504

diff --git a/main.py b/main.py
@@ -43,6 +43,7 @@ def on_keydown(self, event):
                 self.mel = True
             elif event.key == K_UP and not self.player.doorChange:
                 self.player.doorChange = True
+
             elif event.key == K_DOWN:
                 self.player.cleaning = True
                 self.player.cleaningSlowdown = CLEAN_SLOWDOWN

diff --git a/world/door.py b/world/door.py
@@ -4,12 +4,16 @@
 
 
 class Door(Sprite):
-    def __init__(self, nextLevel, loc):
+    def __init__(self, nextLevel, loc,image,openImage):
         Sprite.__init__(self)
-        self.rect = Rect(loc, TILE_SIZE)
-        self.image = Surface(self.rect.size)
-        draw.rect(self.image, (255,0,255), self.image.get_rect()) ## REPLACE THIS WITH AN IMAGE
+        self.openImage = openImage
+
+        self.image = image
+        self.rect = self.image.get_rect()
+        self.rect.topleft = loc
         self.nextLevel = nextLevel
 
     def draw(self, surface):
         surface.blit(self.image, (self.rect.topleft))
+    def open(self):
+        self.image = self.openImage