Turn Consumable into Bottle that may be full or empty.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index a7bcf3772a4ab8f5e0351d63bb1da6f0e86c2f52..eca94003d6c8a5a52e3b6f15d13464f188c17d86 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -4,7 +4,7 @@ from plomrogue.errors import PlayError, GameError
 
 class Task:
     argtypes = ''
-    todo = 3
+    todo = 1
 
     def __init__(self, thing, args=()):
         self.thing = thing
@@ -16,7 +16,6 @@ class Task:
 
 
 class Task_WAIT(Task):
-    todo = 1
 
     def do(self):
         pass
@@ -24,7 +23,6 @@ class Task_WAIT(Task):
 
 
 class Task_MOVE(Task):
-    todo = 1
     argtypes = 'string:direction'
 
     def get_move_target(self):
@@ -47,7 +45,6 @@ class Task_MOVE(Task):
 
 
 class Task_WRITE(Task):
-    todo = 1
     argtypes = 'string:char string'
 
     def check(self):
@@ -63,7 +60,6 @@ class Task_WRITE(Task):
 
 
 class Task_FLATTEN_SURROUNDINGS(Task):
-    todo = 10
     argtypes = 'string'
 
     def check(self):
@@ -80,7 +76,6 @@ class Task_FLATTEN_SURROUNDINGS(Task):
 
 
 class Task_PICK_UP(Task):
-    todo = 1
 
     def check(self):
         if self.thing.carrying:
@@ -104,7 +99,6 @@ class Task_PICK_UP(Task):
 
 
 class Task_DROP(Task):
-    todo = 1
 
     def check(self):
         if not self.thing.carrying:
@@ -112,3 +106,56 @@ class Task_DROP(Task):
 
     def do(self):
         self.thing.carrying = None
+
+
+
+class Task_DOOR(Task):
+
+    def do(self):
+        self.thing.carrying = None
+        action_radius = list(self.thing.game.map_geometry.
+                             get_neighbors_yxyx(self.thing.position).values())
+        for t in [t for t in self.thing.game.things if
+                  t.type_ == 'Door' and t.position in action_radius]:
+            if t.blocking:
+                t.open()
+            else:
+                t.close()
+
+
+
+class Task_INTOXICATE(Task):
+
+    def check(self):
+        if self.thing.carrying is None:
+            raise PlayError('carrying nothing to drink from')
+        if self.thing.carrying.type_ != 'Bottle':
+            raise PlayError('cannot drink from non-bottle')
+        if not self.thing.carrying.full:
+            raise PlayError('bottle is empty')
+
+    def do(self):
+        self.thing.carrying.full = False
+        for c_id in self.thing.game.sessions:
+            if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_:
+                self.thing.game.io.send('RANDOM_COLORS', c_id)
+                self.thing.game.io.send('CHAT "You are drunk now."', c_id)
+                break
+        self.thing.drunk = 10000
+
+
+class Task_COMMAND(Task):
+    argtypes = 'string'
+
+    def check(self):
+        if self.thing.carrying is None:
+            raise PlayError('nothing to command')
+        if not self.thing.carrying.commandable:
+            raise PlayError('cannot command this item type')
+
+    def do(self):
+        from plomrogue.misc import quote
+        reply = self.thing.carrying.interpret(self.args[0])
+        for c_id in self.thing.game.sessions:
+            if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_:
+                self.thing.game.io.send('REPLY ' + quote(reply), c_id)