Manual adjustment of pirates aboard

[ypp-sc-tools.web-live.git] / yoweb-scrape

diff --git a/yoweb-scrape b/yoweb-scrape
index cc98ea3b21b869154ed0a46ca5aec941d7f71a71..43b95225638fe6731938b7d1682adb10d83c33ba 100755 (executable)
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -512,6 +512,11 @@ class ChatLogTracker:
                def ob1(did): ob_x(m.group(1), did); return d(did)
                def oba(did): return ob1('%s %s' % (did, m.group(2)))
 
+               def disembark(who, how):
+                       ob_x(who, 'leaving '+how)
+                       del self._v[who]
+                       del self._pl[who]
+
                m = rm('Going aboard the (\\S.*\\S)\\.\\.\\.$')
                if m:
                        pn = self._myself.name
@@ -557,7 +562,34 @@ class ChatLogTracker:
                                pa.last_chat_time = timestamp
                                pa.last_chat_chan = what
                                self.force_redisplay()
-                               return d(what+' chat')
+                               return d('chat '+what)
+
+               def chat_metacmd(what):
+                       (cmdr, metacmd) = m.groups()
+                       metacmd = regexp.sub('\\s+', ' ', metacmd).strip()
+                       m2 = regexp.match(
+                               '/([ad]) (?:([A-Za-z ]+)\\s*:)?([A-Za-z ]+)$',
+                               metacmd)
+                       if not m2: return chat(what)
+
+                       (cmd, vn, targets) = m2.groups()
+
+                       if cmdr == self._myself.name: how = 'manual: /%s' % cmd
+                       else: how = '/%s %s' % (cmd,cmdr)
+                       if cmd == 'a': each = ob_x
+                       else: each = disembark
+
+                       if vn is not None:
+                               vn = vn.title()
+                               if not regexp.match(
+                                               '(?:.* )?' + vn + '$',
+                                               self._vessel):
+                                       return chat('/%s %s:' % (cmd,vn))
+
+                       for target in targets.split(' '):
+                               if not target: continue
+                               each(target.title(), how)
+                       return d('/%s' % cmd)
 
                m = rm('(\\w+) (?:issued an order|ordered everyone) "')
                if m: return ob1('general order');
@@ -568,11 +600,14 @@ class ChatLogTracker:
                m = rm('(\\w+) tells ye, "')
                if m: return chat('private')
 
+               m = rm('Ye told (\\w+), "(.*)"$')
+               if m: return chat_metacmd('private')
+
                m = rm('(\\w+) flag officer chats, "')
                if m: return chat('flag officer')
 
-               m = rm('(\\w+) officer chats, "')
-               if m: return chat('officer')
+               m = rm('(\\w+) officer chats, "(.*)"$')
+               if m: return chat_metacmd('officer')
 
                m = rm('Game over\\.  Winners: ([A-Za-z, ]+)\\.$')
                if m:
@@ -589,10 +624,7 @@ class ChatLogTracker:
 
                m = rm('(\\w+) has left the vessel\.')
                if m:
-                       who = m.group(1)
-                       ob_x(who, 'disembarked')
-                       del self._v[who]
-                       del self._pl[who]
+                       disembark(m.group(1), 'disembarked')
                        return d('disembarked')
 
                return d('not matched')
@@ -853,7 +885,7 @@ def do_ship_aid(args, bu):
 
                displayer.show(s)
                time.sleep(1)
-               rotate_nya = rotate_nya[1:2] + rotate_nya[0]
+               rotate_nya = rotate_nya[1:3] + rotate_nya[0]
 
 #---------- main program ----------