G点

wong2 · Jan 26, 2013 · 2ce35a6 · Wizmann · Jan 26, 2013 · wong2
1 parent b49dda5
commit 2ce35a6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/plugins/calc24.py b/plugins/calc24.py
@@ -65,7 +65,7 @@ def __str__(self):
 
 def test(data, bot):
     message = data['message']
-    if not re.search('算[\d-]+点', message) \
+    if not re.search('算[G\d-]+点', message) \
             or not re.search('(?:.*\[)(.+)(?:\][.]*)', message):
         return False
     else:
@@ -86,13 +86,16 @@ def solve(ans, nums):
 def handle(data, bot):
     message = data['message']
     query = re.findall('(?:.*\[)(.+)(?:\][.]*)', message)
-    ans = re.findall('算([\d-]+)点', message)
+    ans = re.findall('算([G\d-]+)点', message)
     try:
         if len(query) == 0 or len(ans) == 0:
             raise Calc24Exception("表达式错误哦~")
         else:
             try:
-                ans = int(ans[0])
+                ans_str = ans[0]
+                if ans_str == 'G':
+                    return '啊啊啊！不要碰那里！'
+                ans = int(ans_str)
             except:
                 raise Calc24Exception("表达式错误哦~")
             nums = map(lambda x: x.strip(), query[0].split(','))
@@ -161,5 +164,5 @@ def conv(ch):
                   'author_id': 'Wizmann'}, None)
     print handle({'message': 'Hello World 算24点 [F,U,C,K]',
                  'author_id': 'Kuuy'}, None)
-
     print handle({'message': 'Hello World 算24点 [1, 1, 12, 13]'}, None)
+    print handle({'message': '算G点 [1, 1, 12, 13]'}, None)