Changeset 248

Timestamp:

09/09/03 19:46:13 (8 years ago)

Author:

kevdadrum

Message:

Moved some question handling from simple_general into complex_questions where I think it belongs: this fixes the problem I was having where I couldn't get complex_questions to listen to "do you want this thingie?" because the simple handler was grabbing it first.

Location:

trunk/plugins/en

Files:

• complex_questions.tcl (modified) (21 diffs)
• simple_general.tcl (modified) (1 diff)

trunk/plugins/en/complex_questions.tcl

@@ -16 +16 @@
 
 proc bMotion_plugin_complex_question { nick host handle channel text } {
-
+  bMotion_putloglev 2 * "Question handler triggerred"
   global botnicks bMotionFacts
 
   regsub {(.+)[>\/]$} $text {\1?} text
-
+  bMotion_putloglev 3 * "Checking question for 'what'"
   ## What question targeted at me
   if { [regexp -nocase "what('?s)?(.+)" $text matches s question] ||
@@ -33 +33 @@
   }
 
+  bMotion_putloglev 3 * "Checking question for 'with/at/against'"
   ## With/at/against who question targeted at me
   if { [regexp -nocase "^$botnicks,?:? (with|at|against|by) who" $text ma mb prop] ||
@@ -40 +41 @@
   }
 
+  bMotion_putloglev 3 * "Checking question for 'who'"
   ## Who question targeted at me
   if { [regexp -nocase "^$botnicks,?:? who(se|'s)? " $text matches bot owner] ||
@@ -47 +49 @@
   }
 
+  bMotion_putloglev 3 * "Checking question for 'want'"
   ## Want question targetted at me
   if { [regexp -nocase "^$botnicks,?:? do you (need|want) (a|these|this|some|the|those|that)" $text] ||
@@ -53 +56 @@
       return 1
   }
-  
+
+  bMotion_putloglev 3 * "Checking question for 'why'"
   ## Why question targeted at me
   if { [regexp -nocase "^$botnicks,?:? why" $text] ||
@@ -61 +65 @@
   }
 
+  bMotion_putloglev 3 * "Checking question for 'where'"
   ## Where question targeted at me
   if { [regexp -nocase "^$botnicks,?:? where" $text] ||
@@ -68 +73 @@
   }
 
+  bMotion_putloglev 3 * "Checking question for 'how many'"
   ## How many question targeted at me
   if { [regexp -nocase "^$botnicks,?:? how ?many" $text] ||
@@ -75 +81 @@
   }
 
+  bMotion_putloglev 3 * "Checking question for 'when'"
   ## When question targeted at me
   if { [regexp -nocase "^$botnicks,?:? (when|what time)" $text] ||
@@ -82 +89 @@
   }
 
+  bMotion_putloglev 3 * "Checking question for 'how'"
   ## How question targeted at me
   if { [regexp -nocase "^$botnicks,?:? how" $text] ||
@@ -89 +97 @@
   }
 
+  bMotion_putloglev 3 * "Checking question for some general questions"    
+  # some other random responses, handled here rather than simple_general so as not to break other code  
+    if [regexp -nocase  "^${botnicks}:?,? do(n'?t)? you (like|want|find .+ attractive|get horny|(find|think) .+ (is ?)horny|have|keep)" $text] {
+    bMotion_putloglev 2 * "$nick general question"
+    bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{yesnos}"
+    return 1
+  }
+    
   # me .... ?
   if [regexp -nocase "^${botnicks}:?,? (.+)\\?$" $text ming ming2 question] {
+    bMotion_putloglev 2 * "$nick final question catch"
     bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{randomReplies}"
     return 1
@@ -97 +114 @@
   # ... me?
   if [regexp -nocase "${botnicks}\\?$" $text bhar ming what] {
+    bMotion_putloglev 2 * "$nick very final question catch"
     if { [rand 2] == 1 } {
       bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{randomReplies}"
@@ -104 +122 @@
 
   if [bMotionTalkingToMe $text] {
+    bMotion_putloglev 2 * "$nick talkingtome catch"
     bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{randomReplies}"
     return 1
@@ -111 +130 @@
 
 proc bMotion_plugin_complex_question_what { nick channel host question } {
+    bMotion_putloglev 2 * "$nick what is $question question"
     global bMotionInfo bMotionFacts bMotionOriginalInput
     #see if we know the answer to it
@@ -156 +176 @@
 
 proc bMotion_plugin_complex_question_when { nick channel host } {
+    bMotion_putloglev 2 * "$nick When question"
   bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{answerWhens}"
   return 1
@@ -161 +182 @@
 
 proc bMotion_plugin_complex_question_with { nick channel host prop } {
+    bMotion_putloglev 2 * "$nick with question"
   set answer "$prop %VAR{answerWithWhos}"
   bMotionDoAction $channel [bMotionGetRealName $nick $host] $answer
@@ -167 +189 @@
 
 proc bMotion_plugin_complex_question_who { nick channel host owner } {
+    bMotion_putloglev 2 * "$nick who question"
   if {$owner == "se"} {
     set line "%OWNER[%VAR{answerWhos}]"
@@ -177 +200 @@
 
 proc bMotion_plugin_complex_question_want { nick channel host } {
+    bMotion_putloglev 2 * "$nick Want/need question"
     bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{question_want_reply_wrapper}"
     return 1
@@ -182 +206 @@
 
 proc bMotion_plugin_complex_question_why { nick channel host } {
+    bMotion_putloglev 2 * "$nick why question"
   bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{answerWhys}"
   return 1
@@ -187 +212 @@
 
 proc bMotion_plugin_complex_question_where { nick channel host } {
+    bMotion_putloglev 2 * "$nick where question"
   bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{answerWheres}"
   return 1
@@ -192 +218 @@
 
 proc bMotion_plugin_complex_question_many { nick channel host } {
+    bMotion_putloglev 2 * "$nick how many question"
   bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{answerHowmanys}"
   return 1
@@ -197 +224 @@
 
 proc bMotion_plugin_complex_question_how { nick channel host } {
+    bMotion_putloglev 2 * "$nick how question"
   bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{answerHows}"
   return 1

trunk/plugins/en/simple_general.tcl

@@ -32 +32 @@
 bMotion_plugin_add_simple "didn't!" "^i didn'?t!?$" 40 "%VAR{ididntresponses}" "en"
 bMotion_plugin_add_simple "ow" "^(ow+|ouch|aie+)!*$" 50 "%VAR{awwws}" "en"
-bMotion_plugin_add_simple "question-have" "^%botnicks:?,? do(n'?t)? you (like|want|find .+ attractive|get horny|(find|think) .+ (is ?)horny|have|keep)" 100 "%VAR{yesnos}" "en"
+#kis moved the following line to complex_questions because it was breaking stuff.
+#kis bMotion_plugin_add_simple "question-have" "^%botnicks:?,? do(n'?t)? you (like|want|find .+ attractive|get horny|(find|think) .+ (is ?)horny|have|keep)" 100 "%VAR{yesnos}" "en"
 bMotion_plugin_add_simple "dude" "^Dude!$" 40 "%VAR{sweet}" "en"
 bMotion_plugin_add_simple "sweet" "^Sweet!$" 40 "%VAR{dude}" "en"