Mercurial > jelly

changeset 23:66a1869d2851

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pick up items from creates
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Fri, 16 Mar 2012 10:58:18 +0100
parents 40dbaddd1239
children 2e887147e4d8
files jelly/display.py jelly/level.py jelly/mobs.py
diffstat 3 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/jelly/display.py	Thu Mar 15 23:02:19 2012 +0100
+++ b/jelly/display.py	Fri Mar 16 10:58:18 2012 +0100
@@ -216,7 +216,7 @@
             sprite = self.mob_sprites[id(mob)]
         except KeyError:
             return
-        msg = message.Message(text, sprite.rect.midbottom)
+        msg = message.Message(text, sprite.rect.center)
         msg.depth = sprite.depth
         self.sprites.add(msg)
 
--- a/jelly/level.py	Thu Mar 15 23:02:19 2012 +0100
+++ b/jelly/level.py	Fri Mar 16 10:58:18 2012 +0100
@@ -91,11 +91,12 @@
         if mob.hit(self, attacker):
             self.events.append(('mob_gibs', mob, mob.color, 8, 2))
 
-    def open(self, mob):
+    def open(self, mob, item):
         self.mobs.remove(mob)
         self.events.append(('mob_open', mob))
         self.events.append(('mob_dust', mob, 10, 4))
-        self.message(mob, 'Empty')
+        self.message(mob, item)
+        self.pc.items.append(item)
 
 
     def stand(self, mob, direction, dust=False):
--- a/jelly/mobs.py	Thu Mar 15 23:02:19 2012 +0100
+++ b/jelly/mobs.py	Fri Mar 16 10:58:18 2012 +0100
@@ -172,11 +172,15 @@
     name = 'crate'
     animation = [16]
 
+    def __init__(self, *args, **kwargs):
+        super(Crate, self).__init__(*args, **kwargs)
+        self.item = 'Empty'
+
     def control(self, level):
         pass
 
     def hit(self, level, attacker):
-        level.open(self)
+        level.open(self, self.item)
 
 class Ladder(Mob):
     name = 'ladder'
@@ -204,12 +208,7 @@
         self.level = 0
         self.max_hp = 100
         self.hp = self.max_hp
-        self.items = [
-            'Aaaaa',
-            'Bbbbb',
-            'Ccccc',
-            'Ddddd',
-        ]
+        self.items = []
 
 
     def place(self, (x, y)):
@@ -224,7 +223,7 @@
         return True
 
     def inventory_menu(self, display):
-        menu = message.Menu((480, 20), self.items)
+        menu = message.Menu((480, 20), self.items or ['Empty'])
         display.render_menu(menu)
         choice = None
         clock = pygame.time.Clock()