X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fcommand.scm;h=765962ce28dcd88defa2efbfe814f029bb5440c9;hp=31687389cf9a17af83e2f02e318d2f28b377100b;hb=6f7c1d4f9a2043c16f83facef6b3216e45e14f40;hpb=f1a3d508745069bceecb02cb475c0104020dce16

diff --git a/mudsync/command.scm b/mudsync/command.scm
index 3168738..765962c 100644
--- a/mudsync/command.scm
+++ b/mudsync/command.scm
@@ -18,7 +18,7 @@
 
 (define-module (mudsync command)
   #:use-module (mudsync parser)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
   #:use-module (ice-9 control)
@@ -32,9 +32,10 @@
             command-priority
 
             direct-command
-            indir-command
+            prep-indir-command
+            prep-direct-command
             loose-direct-command
-            loose-indir-command
+            loose-prep-command
             empty-command
             direct-greedy-command
             greedy-command
@@ -89,7 +90,7 @@
                 %default-priority))
 
 
-(define* (indir-command verbs action #:optional prepositions)
+(define* (prep-indir-command verbs action #:optional prepositions)
   (make-command verbs
                 cmatch-indir-obj
                 (lambda* (goes-by #:key direct-obj indir-obj preposition)
@@ -101,7 +102,19 @@
                 action
                 %high-priority))
 
-(define* (loose-indir-command verbs action #:optional prepositions)
+(define* (prep-direct-command verbs action #:optional prepositions)
+  (make-command verbs
+                cmatch-indir-obj
+                (lambda* (goes-by #:key direct-obj indir-obj preposition)
+                  (if prepositions
+                      (and
+                       (member  direct-obj goes-by)
+                       (member preposition prepositions))
+                      (member direct-obj goes-by)))
+                action
+                %high-priority))
+
+(define* (loose-prep-command verbs action #:optional prepositions)
   (make-command verbs
                 cmatch-indir-obj
                 (const #t)