X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=8fa3a178067bf4864f929638b79d5a8e4d8bb6d2;hb=920a6e5b6e7d355aaaf0ae79ed194eab6e00b999;hp=8b831313c9d69a14f5b92b9f81273a13274e27b3;hpb=7faae7c97770388f0067c541d27e21573008115d;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 8b83131..8fa3a17 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -103,8 +103,20 @@ class Task_DROP(Task):
     def check(self):
         if not self.thing.carrying:
             raise PlayError('nothing to drop')
+        if self.thing.carrying.type_ == 'Bottle' and self.thing.carrying.full:
+            for t in [t for t in self.thing.game.things
+                      if t.type_ == 'BottleDeposit'
+                      and t.position == self.thing.position]:
+                raise PlayError('cannot drop full bottle into bottle deposit')
 
     def do(self):
+        if self.thing.carrying.type_ == 'Bottle' and not self.thing.carrying.full:
+            for t in [t for t in self.thing.game.things
+                      if t.type_ == 'BottleDeposit'
+                      and t.position == self.thing.position]:
+                t.accept()
+                self.thing.game.things.remove(self.thing.carrying)
+                break
         self.thing.carrying = None
 
 
@@ -128,15 +140,35 @@ class Task_INTOXICATE(Task):
 
     def check(self):
         if self.thing.carrying is None:
-            raise PlayError('nothing to consume')
-        if self.thing.carrying.type_ != 'Consumable':
-            raise PlayError('cannot consume non-consumable')
+            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.game.things.remove(self.thing.carrying)
-        self.thing.carrying = None
+        self.thing.carrying.full = False
+        self.thing.carrying.empty()
         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)