Mercurial > fujo

changeset 94:417dc5cd0ef9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
align items
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Mon, 06 Jan 2014 00:37:43 +0100
parents d9f826cdf023
children 02afe37cd2f1
files fujo/display.py fujo/items.py fujo/mobs.py fujo/monsters.png fujo/player.png fujo/things.png fujo/things.py
diffstat 7 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/fujo/display.py	Mon Jan 06 00:12:24 2014 +0100
+++ b/fujo/display.py	Mon Jan 06 00:37:43 2014 +0100
@@ -104,6 +104,11 @@
             self.sprites.add(mob)
             self.shadows.add(things.Shadow(mob))
 
+    def spawn_thing(self, thing):
+        if thing not in self.sprites:
+            self.sprites.add(thing)
+            self.shadows.add(things.Shadow(thing, 1))
+
     def render_level(self, level):
         self.background = pygame.Surface(self.size)
         self.overlay = pygame.Surface(self.size, pygame.SRCALPHA)
@@ -125,7 +130,7 @@
         for mob in level.mobs.values():
             self.spawn_mob(mob)
         for thing in level.things.values():
-            self.spawn_mob(thing)
+            self.spawn_thing(thing)
         self.update_explored(level)
 
     def update_explored(self, level):
--- a/fujo/items.py	Mon Jan 06 00:12:24 2014 +0100
+++ b/fujo/items.py	Mon Jan 06 00:37:43 2014 +0100
@@ -38,13 +38,13 @@
         self.kill()
 
     def throw_anim(self, pos, steps, direction):
-        self.rect.topleft = 24 * pos[0] - 16, 16 * pos[1] - 31
+        self.rect.midbottom = 24 * pos[0], 16 * pos[1] - 3
         for step in xrange(steps):
             for frame in xrange(2):
                 self.rect.move_ip(DX[direction] * 12, DY[direction] * 8)
                 self.depth = self.rect.bottom + 8
                 yield
-        self.rect.topleft = 24 * self.pos[0] - 16, 16 * self.pos[1] - 23
+        self.rect.midbottom = 24 * pos[0], 16 * pos[1] + 5
         self.depth = self.rect.bottom
         self.kill()
 
--- a/fujo/mobs.py	Mon Jan 06 00:12:24 2014 +0100
+++ b/fujo/mobs.py	Mon Jan 06 00:37:43 2014 +0100
@@ -29,7 +29,7 @@
 
     def set_pos(self, pos):
         if self.pos is None:
-            self.rect.midbottom = 24 * pos[0], 16 * pos[1] + 9
+            self.rect.midbottom = 24 * pos[0], 16 * pos[1] + 5
         self.pos = pos
         self.depth = self.rect.bottom
 
Binary file fujo/monsters.png has changed
Binary file fujo/player.png has changed
Binary file fujo/things.png has changed
--- a/fujo/things.py	Mon Jan 06 00:12:24 2014 +0100
+++ b/fujo/things.py	Mon Jan 06 00:37:43 2014 +0100
@@ -10,9 +10,9 @@
 
 
 class Shadow(pygame.sprite.Sprite):
-    def __init__(self, sprite):
+    def __init__(self, sprite, looks=0):
         super(Shadow, self).__init__()
-        self.image = RES.things[0]
+        self.image = RES.things[looks]
         self.rect = self.image.get_rect()
         self.sprite = weakref.ref(sprite)
 
@@ -41,7 +41,7 @@
 
     def set_pos(self, pos):
         if self.pos is None:
-            self.rect.topleft = 24 * pos[0] - 16, 16 * pos[1] - 23
+            self.rect.midbottom = 24 * pos[0], 16 * pos[1] + 5
         self.pos = pos
         self.depth = self.rect.bottom