# HG changeset patch # User Neil Muller # Date 1302369259 -7200 # Node ID 827c5d045cf5a1dacc027e2b34fcfd6fbc961458 # Parent fe99a4e04b2b9473a60b4623f2e5ab5702e09b45 Don't allow the cannon to be picked up diff -r fe99a4e04b2b -r 827c5d045cf5 skaapsteker/sprites/base.py --- 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): diff -r fe99a4e04b2b -r 827c5d045cf5 skaapsteker/sprites/items.py --- 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 + ##################################################