home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add thing name editing.
[plomrogue2]
/
plomrogue
/
things.py
diff --git
a/plomrogue/things.py
b/plomrogue/things.py
index cedee68266583f9486dea676a0d67bd5bacb2378..0edf8fbed42a83363ad43d0012a4a1f74cd37685 100644
(file)
--- a/
plomrogue/things.py
+++ b/
plomrogue/things.py
@@
-6,7
+6,7
@@
from plomrogue.mapping import YX
class ThingBase:
type_ = '?'
class ThingBase:
type_ = '?'
- def __init__(self, game, id_=0, position=(YX(0,
0),YX(0,
0))):
+ def __init__(self, game, id_=0, position=(YX(0,
0), YX(0,
0))):
self.game = game
if id_ == 0:
self.id_ = self.game.new_thing_id()
self.game = game
if id_ == 0:
self.id_ = self.game.new_thing_id()
@@
-40,11
+40,6
@@
class Thing_Item(Thing):
-class Thing_Furniture(Thing):
- symbol_hint = 'h'
-
-
-
class ThingAnimate(Thing):
blocking = True
class ThingAnimate(Thing):
blocking = True
@@
-81,8
+76,7
@@
class ThingAnimate(Thing):
self.task.check()
except GameError as e:
self.task = None
self.task.check()
except GameError as e:
self.task = None
- raise GameError
- return
+ raise e
self.task.todo -= 1
if self.task.todo <= 0:
self._last_task_result = self.task.do()
self.task.todo -= 1
if self.task.todo <= 0:
self._last_task_result = self.task.do()