changeset 434:827c5d045cf5

Don't allow the cannon to be picked up
author Neil Muller <drnlmuller@gmail.com>
date Sat, 09 Apr 2011 19:14:19 +0200
parents fe99a4e04b2b
children b6fdaf8e453c
files skaapsteker/sprites/base.py skaapsteker/sprites/items.py
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/skaapsteker/sprites/base.py	Sat Apr 09 19:00:43 2011 +0200
+++ b/skaapsteker/sprites/base.py	Sat Apr 09 19:14:19 2011 +0200
@@ -329,6 +329,7 @@
     mobile = False
     gravitates = False
     actionable = True
+    liftable = True
 
     collision_layer = NPC_LAYER
 
@@ -346,7 +347,8 @@
 
 
     def player_action(self, player):
-        player.take_item(self)
+        if self.liftable:
+            player.take_item(self)
 
 
     def remove(self):
--- a/skaapsteker/sprites/items.py	Sat Apr 09 19:00:43 2011 +0200
+++ b/skaapsteker/sprites/items.py	Sat Apr 09 19:14:19 2011 +0200
@@ -168,6 +168,8 @@
     whole_image_file = 'props/cannon-whole.png'
     broken_image_file = 'props/cannon-broken.png'
 
+    liftable = False
+
 
 
 ##################################################