Changeset 934 for trunk

Timestamp:

30/06/2008 15:57:51 (5 months ago)

Author:

james

Message:

new stuff from b

Location:

trunk/plugins/en

Files:

• action_complex_failsafe.tcl (modified) (5 diffs)
• complex_questions.tcl (modified) (4 diffs)

trunk/plugins/en/action_complex_failsafe.tcl

@@ -28 +28 @@
         #try to figure out something geneal about this action
         if [regexp -nocase {(hug(gle)?|p[ae]t|rub|like|<3|sniff|smell|nibble|tickle)s?} $verb] {
-                bMotionDoAction $channel $nick "%VAR{failsafe_nice}"
+                bMotionDoAction $channel $nick "%VAR{failsafe_nice}" $verb
                 bMotionGetHappy
                 driftFriendship $nick 1
@@ -41 +41 @@
         }
 
-        if [regexp -nocase "(eyes|looks|stares)" $verb] {
-                bMotionDoAction $channel $nick "%VAR{whats}"
+        if [regexp "(dance|sing|play|bop|doof)s?" $verb] {
+                bMotionDoAction $channel $nick "%VAR{failsafe_niceactions}"
+                bMotionGetHappy
+                driftFriendship $nick 10
+                return 1
+        }
+
+        if [regexp "(cum|come|jizze|spurt)s?" $verb] {
+                bMotionDoAction $channel $nick "%VAR{failsafe_wtfs}"
+                bMotionGetHappy
+                bMotionGetHorny
+                driftFriendship $nick 10
+        } 
+
+
+        if [regexp "(look|stare|eye|frown)s?" $verb] {
+                bMotionDoAction $channel $nick "%VAR{failsafe_lookback}"
+                bMotionGetHappy
+                driftFriendship $nick 10
                 return 1
         }
@@ -49 +66 @@
 
         if {$whee > 5} {
-        bMotionDoAction $channel $nick "%VAR{failsafes_a}"
+        bMotionDoAction $channel $nick "%VAR{failsafes_a}" $verb
   } else {
         bMotionDoAction $channel $verb "%VAR{failsafes_b}" $dir
@@ -94 +111 @@
 
 bMotion_abstract_register "failsafe_nice"
-bMotion_abstract_batchadd "failsafe_nice" [list "mmm" "%VAR{smiles}" "%VAR{smiles}%|/gives %% %VAR{sillyThings}"]
+bMotion_abstract_batchadd "failsafe_nice" [list "mmm" "%VAR{smiles}" "%VAR{smiles}%|/gives %% %VAR{sillyThings}" "i do love a good %2ing"]
 
 
 bMotion_abstract_register "failsafes_a"
-bMotion_abstract_batchadd "failsafes_a" [list "%VAR{rarrs}" "%REPEAT{3:7:m}" "%VAR{thanks}" "what" "/loves it" "/passes it on to %ruser" "/. o O ( ? )"]
+bMotion_abstract_batchadd "failsafes_a" [list "%VAR{rarrs}" "%REPEAT{3:7:m}" "%VAR{thanks}" "what" "/loves it" "/passes it on to %ruser" "/. o O ( ? )" "i do love a good %%ing"]
 
 bMotion_abstract_register "failsafes_b"
-bMotion_abstract_batchadd "failsafes_b" [list "/%% %2 %SETTING{complex:failsafe:last:nick:moo} back with %VAR{sillyThings}" "/%% %2 %SETTING{complex:failsafe:last:nick:moo}" "/%VERB{%VAR{sillyThings}{strip}} %2 %SETTING{complex:failsafe:last:nick:moo} in return"]
+bMotion_abstract_batchadd "failsafes_b" [list "/%% %2 %SETTING{complex:failsafe:last:nick:moo} back with %VAR{sillyThings}" "/%% %2 %SETTING{complex:failsafe:last:nick:moo}" "/%VERB{%VAR{sillyThings}{strip}} %2 %SETTING{complex:failsafe:last:nick:moo} in return" "i do love a good %%ing"]
 
 bMotion_abstract_register "squeezeds"
@@ -108 +125 @@
 bMotion_abstract_register "whats"
 bMotion_abstract_batchadd "whats" [list "what?" "hmm?" "hello? yes?" "er... they did it%|/points at %ruser" "/stares back"]
+
+ bMotion_abstract_register "failsafe_lookback"
+ bMotion_abstract_batchadd "failsafe_lookback" [list "/stares at %%" "hello, yes?" "i can still see you..." "/poses" "/bounces away" "%VAR{smiles}" "/looks at %%" ]
+ 
+bMotion_abstract_register "failsafe_wtfs"
+bMotion_abstract_batchadd "failsafe_wtfs" [list "%VAR{satOns}" "%VAR{shocked}" ]
+
+bMotion_abstract_register "failsafe_niceactions"
+bMotion_abstract_batchadd "failsafe_niceactions" [list "wh%REPEAT{3:7:e} %VAR{smiles}" "%VAR{smiles}" "/bounces around" "*drool*" ]
+
+

trunk/plugins/en/complex_questions.tcl

@@ -94 +94 @@
   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] ||
-        [regexp -nocase "^do you (want|need) (a|these|this|some|the|those|that) .* $botnicks ?\\?" $text] ||
-        [regexp -nocase "^$botnicks,?:? would you like" $text] ||
-        [regexp -nocase "^would you like .+ $botnicks" $text] ||
-        [regexp -nocase "^$botnicks,?:? (do )?((yo)?u )?wanna" $text] ||
-        [regexp -nocase "^(do )?((yo)?u )?wanna .+ $botnicks" $text] } {
-      bMotion_plugin_complex_question_want $nick $channel $host
+        set item ""
+  if { [regexp -nocase "^$botnicks,?:? do you (need|want) (a|these|this|some|the|those|that) (.+)" $text matches a b c item] ||
+        [regexp -nocase "^do you (want|need) (a|these|this|some|the|those|that) (.*) $botnicks ?\\?" $text matches a b item] ||
+        [regexp -nocase "^$botnicks,?:? would you like (.+)" $text matches a item] ||
+        [regexp -nocase "^(do|would) you like (.+) $botnicks" $text matches item] ||
+        [regexp -nocase "^$botnicks,?:? (do )?((yo)?u )?wanna (.+)" $text matches item] ||
+        [regexp -nocase "^(do )?((yo)?u )?wanna (.+) $botnicks" $text matches item] } {
+      bMotion_plugin_complex_question_want $nick $channel $host $item
       return 1
   }
@@ -357 +358 @@
 }
 
-proc bMotion_plugin_complex_question_want { nick channel host } {
+proc bMotion_plugin_complex_question_want { nick channel host { item "" } } {
     bMotion_putloglev 2 * "$nick Want/need question"
-    bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{question_want_reply_wrapper}"
+
+                if {$item != ""} {
+                        # let's try to figure out if this is an item proper or something like "to go home" etc
+                        if {[regexp -nocase "^(to)" $item]} {
+                                # TODO: scope for improvement --^
+                                bMotion_putloglev 3 * "item actually looks like an action, using generic answer for now"
+                                bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{question_want_reply_wrapper}"
+                                return 1
+                        }
+
+                        # TODO: check if it's a user
+                        # TODO: factorise this code?
+                        # TODO: other tests?
+
+                        bMotion_putloglev 3 * "item looks like an item!"
+                        set original_item $item
+                        set item [string tolower [bMotion_strip_article $item]]
+                        regsub {\?} $item "" item
+                        regsub "s$" $item "" item
+
+                        if [bMotion_abstract_contains "_bmotion_like" $item] {
+                                bMotionDoAction $channel $original_item "%VAR{want_item_like}" $nick
+                                return 1
+                        }
+
+                        if [bMotion_abstract_contains "_bmotion_dislike" $item] {
+                                bMotionDoAction $channel $original_item "%VAR{want_item_dislike}" $nick
+                                return 1
+                        }
+                        
+                        if {[rand 100] > 80} {
+                                bMotionDoAction $channel $original_item "%VAR{want_item_dislike}" $nick
+                                bMotion_abstract_add "_bmotion_dislike" $item
+                        } else {
+                                bMotionDoAction $channel $original_item "%VAR{want_item_like}" $nick
+                                bMotion_abstract_add "_bmotion_like" $item
+                        }
+                        return 1
+                }
+
+                if {$item == ""} {
+                        bMotion_putloglev 3 * "item is blank, using generic want answer"
+                        bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{question_want_reply_wrapper}"
+                }
+
     return 1
 }
@@ -439 +484 @@
 
 proc bMotion_plugin_complex_question_doyou { nick channel host } {
-    bMotion_putloglev 2 * "$nick do you question"
+        bMotion_putloglev 2 * "$nick do you question"
   bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{answerDoyous}"
   return 1
@@ -516 +561 @@
   "%VAR{colours}"
 }
+
+bMotion_abstract_register "want_item_like" {
+        "ooh yes please"
+        "%REPEAT{3:7:m} %%"
+        "yes please %2"
+        "/<3 %%"
+        "yes"
+        "affirmative"
+        "r"
+        "r %VAR{smiles}"
+        "wh%REPEAT{4:10:e}%|%% == best"
+        "%% <3"
+        "%%++"
+}
+
+bMotion_abstract_register "want_item_dislike" {
+        "e%REPEAT{2:5:w} no thanks"
+        "barf"
+        "bleh"
+        "nnk"
+        "do not want"
+        "blah horrible"
+        "no"
+        "no thanks"
+        "negative"
+        "god no"
+        "not a chance"
+}