changeset 531:a29f53a83a7d

Notice when trying to pick up things in wolf form.
author Jeremy Thurgood <firxen@gmail.com>
date Sat, 07 Sep 2013 20:59:02 +0200
parents bc053b9ab53f
children 92e383d95295
files nagslang/collectable.py nagslang/protagonist.py
diffstat 2 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/nagslang/collectable.py	Sat Sep 07 20:58:24 2013 +0200
+++ b/nagslang/collectable.py	Sat Sep 07 20:59:02 2013 +0200
@@ -3,8 +3,9 @@
 from nagslang import environment
 from nagslang import render
 from nagslang.constants import ZORDER_LOW
-from nagslang.game_object import (GameObject, SingleShapePhysicser, Result,
-                                  make_body)
+from nagslang.events import AddDrawableEvent
+from nagslang.game_object import (
+    GameObject, SingleShapePhysicser, Result, make_body, EphemeralNote)
 from nagslang.resources import resources
 
 
@@ -28,7 +29,8 @@
             renderer,
             interactible=environment.Interactible(
                 environment.Action(
-                    self._collect, environment.HumanFormCondition())),
+                    self._collect, environment.HumanFormCondition()),
+                environment.Action(self._object)),
         )
 
     def _collect(self, protagonist):
@@ -36,6 +38,11 @@
         self.physicser.remove_from_space()
         self.collected = True
 
+    def _object(self, protagonist):
+        AddDrawableEvent.post(EphemeralNote(
+            "You can't get a grip on it, but you have no pockets in this form"
+            " anyway.", 2))
+
     def update(self, dt):
         if self.collected:
             return Result(remove=[self])
--- a/nagslang/protagonist.py	Sat Sep 07 20:58:24 2013 +0200
+++ b/nagslang/protagonist.py	Sat Sep 07 20:59:02 2013 +0200
@@ -301,7 +301,7 @@
 
     def shoot(self):
         if not self.has_item('gun'):
-            AddDrawableEvent.post(EphemeralNote('You are not armed', 1))
+            AddDrawableEvent.post(EphemeralNote('You are not armed.', 1))
             return
         vec = vec_from_angle(self.angle, BULLET_SPEED)
         return Result(add=(Bullet(self.get_space(), self.physicser.position,