# HG changeset patch # User Jeremy Thurgood # Date 1378580342 -7200 # Node ID a29f53a83a7dc46bdafcf9a88979ddad15f36021 # Parent bc053b9ab53f7330e035bbf68232f464e491364b Notice when trying to pick up things in wolf form. diff -r bc053b9ab53f -r a29f53a83a7d nagslang/collectable.py --- 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]) diff -r bc053b9ab53f -r a29f53a83a7d nagslang/protagonist.py --- 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,