Changeset 1133

Timestamp:

12/24/11 08:00:29 (5 months ago)

Author:

james

Message:

Updates to randomstuff
Adjust behaviour when opped by another bot

Location:

trunk/modules

Files:

• abstracts/en/randomstuff.tcl (modified) (2 diffs)
• events.tcl (modified) (1 diff)
• interbot.tcl (modified) (1 diff)
• plugins.tcl (modified) (3 diffs)

trunk/modules/abstracts/en/randomstuff.tcl

@@ -8 +8 @@
 bMotion_abstract_reset "randomStuff"
 bMotion_abstract_batchadd "randomStuff" {
+        "%VAR{sillyThings:strip} just kicked in yo!%|%VAR{sound}"
+        "my %VAR{bodypart} is itchy, is that normal?"
         "%VAR{FRENCH}"
         "%VAR{blairisms}"
@@ -548 +550 @@
 ### Used when the channel is 'active' (default < 300 sec since last line)
 bMotion_abstract_register "activeRandomStuff" {
+        "and near the milkshake"
+        "just think how sexy you'd look with my %VAR{bodypart} in your mouth"
+        "just think how sexy you'd look with my %VAR{bodypart} in your %VAR{bodypart}"
         "%ruser really puts the %VAR{sillyThings:strip,triplet} in %VAR{sillyThings:prevtriplet}!"
         "and in the game"

trunk/modules/events.tcl

@@ -523 +523 @@
                 }
                 if {$diff > 900} {
-                        bMotionDoAction $channel $nick "%VAR{opped}"
+                        if [bMotion_interbot_is_bmotion $handle] {
+                                bMotionDoAction $channel $nick "%VAR{thanks}"
+                                bMotionDoAction $channel $nick "%BOT[@$handle,VAR{welcomes}"
+                        } else {
+                                bMotionDoAction $channel $nick "%VAR{opped}"
+                        }
                 } else {
                         bMotion_putloglev d * "Not responding to +o in $channel as I was only deopped $diff seconds ago"

trunk/modules/interbot.tcl

@@ -393 +393 @@
 }
 
+
+# bMotion_interbot_is_bmotion
+#
+# checks if another bot is a bmotion bot
+proc bMotion_interbot_is_bmotion { handle } {
+        global bMotion_interbot_otherbots
+
+        if [info exists bMotion_interbot_otherbots($handle)] {
+                return 1
+        }
+        return 0
+}
+
+
 # set up our binds
 bind bot - "bmotion" bMotion_interbot_catch

trunk/modules/plugins.tcl

@@ -290 +290 @@
         set result [list]
 
+        bMotion_putloglev 5 * "bMotion_plugin_find_output lang=$lang channel=$channel min=$min_priority max=$max_priority name=$name"
+
         foreach key [lsort [array names bMotion_plugins_output]] {
                 set val $bMotion_plugins_output($key)
@@ -307 +309 @@
                 }
 
-                if {!([string match $lang $language] && ($language != "any") && ($language != "all"))} {
+                if {(![string match $lang $language] && ($language != "any") && ($language != "all"))} {
                         bMotion_putloglev 3 * "macro: ignoring $key on language"
-                        bMotion_putloglev 3 * "macro: plugin is $lang, want $language"
+                        bMotion_putloglev 3 * "macro: plugin is $language, want $lang"
                         continue
                 }
@@ -336 +338 @@
         }
 
+        bMotion_putloglev 4 * "Returning list of plugins for $channel: $result2"
         return $result2
 }