Changeset 891 for trunk

Timestamp:

02/17/08 18:54:27 (11 months ago)

Author:

james

Message:

exciting times

Location:

trunk

Files:

• modules/abstract.tcl (modified) (1 diff)
• modules/abstracts/en/abstracts.tcl (modified) (2 diffs)
• modules/friendship.tcl (modified) (2 diffs)
• modules/output.tcl (modified) (48 diffs)
• modules/system.tcl (modified) (5 diffs)
• plugins/en/action_complex_attack.tcl (modified) (1 diff)
• plugins/en/action_complex_fucks.tcl (modified) (1 diff)
• plugins/en/action_complex_hands.tcl (modified) (6 diffs)
• plugins/en/complex_love.tcl (modified) (1 diff)
• plugins/en/complex_nightmare.tcl (modified) (7 diffs)

trunk/modules/abstract.tcl

@@ -344 +344 @@
         }
 
+}
+
+# look to see if an abstract contains an item (warning: could be slow)
+proc bMotion_abstract_contains { abstract item } {
+        bMotion_putloglev 4 * "abstract: bMotion_abstract_contains $abstract $item"
+
+        set contents [bMotion_abstract_all $abstract]
+        putlog $contents
+
+        if {[llength $contents] == 0} {
+                return 0
+        }
+
+        set location [lsearch $contents $item]
+        if {$location > -1} {
+                return 1
+        } else {
+                return 0
+        }
 }
 

trunk/modules/abstracts/en/abstracts.tcl

@@ -1028 +1028 @@
 bMotion_abstract_register "lols"
 bMotion_abstract_register "lostPlot"
-bMotion_abstract_register "loveresponses"
 bMotion_abstract_register "makeItSos"
 bMotion_abstract_register "mingreplies"
@@ -1124 +1123 @@
 bMotion_abstract_batchadd "sorryoks" [list "ok" "that's ok" "alright then" "i forgive you" "/spanks %%%|%BOT\[¬VAR{rarrs}\]" "That's ok then. I suppose. Don't think this makes me like you again though" "humph" ]
 
-bMotion_abstract_batchadd "loveresponses" [list "awww thanks" "i love you too" "i wuv you too" "and i love you" "and i wuv you" "aww wuv you too" "awww *giggle*" "i love you just as much" "i want to have your babies" "/blushes" "hehe thanks" "you know, I've always loved you the most" ":*" ":x" ]
+bMotion_abstract_register "loveresponses" {
+        "awww thanks" 
+        "i love you too" 
+        "i wuv you too" 
+        "and i love you" 
+        "and i wuv you" 
+        "aww wuv you too" 
+        "awww *giggle*" 
+        "i love you just as much" 
+        "i want to have your babies" 
+        "/blushes" 
+        "hehe thanks" 
+        "you know, I've always loved you the most" 
+        ":*" 
+        ":x"
+        "and i love you th%REPEAT{3:7:i}s much: <%REPEAT{10:50:-}>"
+}
+
+bMotion_abstract_register "loveresponses_male" {
+        "and i love you th%REPEAT{3:7:i}s much:%|*schwing*%|%VAR{oops}"
+}
 
 bMotion_abstract_batchadd "hugs" [list "*hugs %%*" "/huggles %%" "/snuggles %%" "*snuggles %%*" "/huggles with %%" "/squeezes %%" "/snoofles %%" ]

trunk/modules/friendship.tcl

@@ -63 +63 @@
 proc setFriendshipHandle { handle friendship } {
         if {$friendship > 100} {
-                bMotion_putloglev 2 * "friendship: friendship for $nick went over 100, capping back to 90"
+                bMotion_putloglev 2 * "friendship: friendship for $handle went over 100, capping back to 90"
                 set friendship 90
         }
 
         if {$friendship < 1} {
-                bMotion_putloglev 2 * "friendship: friendship for $nick went under 1, capping back to 10"
+                bMotion_putloglev 2 * "friendship: friendship for $handle went under 1, capping back to 10"
                 set friendship 10
         }
@@ -85 +85 @@
                 if {![validuser $nick]} {
                         bMotion_putloglev 1 * "friendship: couldn't find a handle for $nick to set friendship."
-                        return 50
+                        return 0
                 }
                 set handle $nick
         }
 
-
-        if {$friendship > 100} {
-                bMotion_putloglev 2 * "friendship: friendship for $nick went over 100, capping back to 9"
-                set friendship 99
-        }
-
-        if {$friendship < 0} {
-                bMotion_putloglev 2 * "friendship: friendship for $nick went under 0, capping back to 1"
-                set friendship 1
-        }
-
-
-        catch {
-                setuser $handle XTRA friend $friendship
-        }
+        setFriendshipHandle $handle $friendship
 }
 

trunk/modules/output.tcl

@@ -31 +31 @@
 
 proc pickRandom { list } {
-                bMotion_putloglev 5 * "pickRandom ($list)"
+        bMotion_putloglev 5 * "pickRandom ($list)"
         return [lindex $list [rand [llength $list]]]
 }
 
 proc getPronoun {} {
-                bMotion_putloglev 5 * "getPronoun"
+        bMotion_putloglev 5 * "getPronoun"
         global bMotionInfo
         if {$bMotionInfo(gender) == "male"} { return "himself" }
@@ -44 +44 @@
 
 proc getHisHers {} {
-                bMotion_putloglev 5 * "getHisHers"
+        bMotion_putloglev 5 * "getHisHers"
         global bMotionInfo
         if {$bMotionInfo(gender) == "male"} { return "his" }
@@ -52 +52 @@
 
 proc getHisHer {} {
-                bMotion_putloglev 5 * "getHisHer"
+        bMotion_putloglev 5 * "getHisHer"
         global bMotionInfo
         if {$bMotionInfo(gender) == "male"} { return "his" }
@@ -61 +61 @@
 
 proc getHeShe {} {
-                bMotion_putloglev 5 * "getHeShe"
+        bMotion_putloglev 5 * "getHeShe"
         global bMotionInfo
         if {$bMotionInfo(gender) == "male"} { return "he" }
@@ -70 +70 @@
 
 proc mee {channel action {urgent 0} } {
-                bMotion_putloglev 5 * "mee ($channel, $action, $urgent)"
+        bMotion_putloglev 5 * "mee ($channel, $action, $urgent)"
         set channel [chandname2name $channel]
         if {$urgent} {
@@ -84 +84 @@
         bMotion_putloglev 5 * "bMotionDoAction($channel,$nick,$text,$moreText,$noTypo)"
         global bMotionInfo bMotionCache bMotionOriginalInput
-                global bMotion_output_delay bMotionSettings BMOTION_SLEEP
-
-                set bMotion_output_delay 0
+        global bMotion_output_delay bMotionSettings BMOTION_SLEEP
+
+        set bMotion_output_delay 0
 
         set bMotionCache($channel,last) 1
@@ -96 +96 @@
         }
 
-                # check if we're asleep
-                if {$bMotionSettings(asleep) == $BMOTION_SLEEP(ASLEEP)} {
-                                return 0
-                }
+        # check if we're asleep
+        if {$bMotionSettings(asleep) == $BMOTION_SLEEP(ASLEEP)} {
+        return 0
+        }
 
         if [regexp "^\[#!\].+" $channel] {
                 set channel [string tolower $channel]
-                                if {![channel get $channel bmotion]} {
+                if {![channel get $channel bmotion]} {
                         bMotion_putloglev d * "bMotion: aborting bMotionDoAction ... $channel not allowed"
                         return 0
@@ -137 +137 @@
 
                 while {[string match "*%|*" $text]} {
-                                                set origtext $text
+                        set origtext $text
                         set sentence [string range $text 0 [expr [string first "%|" $text] -1]]
                         if {$sentence != ""} {
@@ -148 +148 @@
                         }
                         set text [string range $text [expr [string first "%|" $text] + 2] end]
-                                                if {$text == $origtext} {
+                        if {$text == $origtext} {
                                 putlog "bMotion ALERT! Bailed in bMotionDoAction with $text. Lost output."
                                 return 0
@@ -341 +341 @@
 
 proc bMotionInterpolation2 { line } {
-                bMotion_putloglev 5 * "bMotionInterpolation2 ($line)"
+        bMotion_putloglev 5 * "bMotionInterpolation2 ($line)"
         #owners
         set loops 0
@@ -348 +348 @@
                 set BOOM [string map {\\ \\\\ [ \\\[ ] \\\] \{ \\\{ \} \\\} $ \\\$ \" \\\" | \\\|} $BOOM]
 
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %OWNER code with $line"
-                        set line "/has a tremendous error while trying to sort something out :("
-                }
-                # set line [bMotionInsertString $line "%OWNER\{$BOOM\}" [bMotionMakePossessive $BOOM]]
-                regsub -nocase "%OWNER\{$BOOM\}" $line [bMotionMakePossessive $BOOM] line
-                regsub -all "\\\\" $line "" line
-        }
-
-        set loops 0
-        while {[regexp -nocase "%VERB\{(.*?)\}" $line matches BOOM]} {
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %VERB code with $line"
-                        set line "/has a tremendous error while trying to sort something out :("
-                }
-                # set line [bMotionInsertString $line "%VERB\{$BOOM\}" [bMotionMakeVerb $BOOM]]
-                regsub -nocase "%VERB\{$BOOM\}" $line [bMotionMakeVerb $BOOM] line
-        }
-
-        set loops 0
-        while {[regexp -nocase "%PLURAL\{(.*?)\}" $line matches BOOM]} {
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %PLURAL code with $line"
-                        set line "/has a tremendous error while trying to sort something out :("
-                }
-                # set line [bMotionInsertString $line "%PLURAL\{$BOOM\}" [bMotionMakePlural $BOOM]]
-                regsub -nocase "%PLURAL\{$BOOM\}" $line [bMotionMakePlural $BOOM] line
-        }
-
-        set loops 0
-        while {[regexp -nocase "%REPEAT\{(.+?)\}" $line matches BOOM]} {
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %REPEAT code with $line"
-                        set line "/has a tremendous error while trying to sort something out :("
-                }
-                                set replacement [bMotionMakeRepeat $BOOM]
-                regsub -nocase "%REPEAT\\{$BOOM\\}" $line $replacement line
-        }
-
-        return $line
+        incr loops
+        if {$loops > 10} {
+                putlog "bMotion: ALERT! looping too much in %OWNER code with $line"
+                set line "/has a tremendous error while trying to sort something out :("
+        }
+        # set line [bMotionInsertString $line "%OWNER\{$BOOM\}" [bMotionMakePossessive $BOOM]]
+        regsub -nocase "%OWNER\{$BOOM\}" $line [bMotionMakePossessive $BOOM] line
+        regsub -all "\\\\" $line "" line
+}
+
+set loops 0
+while {[regexp -nocase "%VERB\{(.*?)\}" $line matches BOOM]} {
+        incr loops
+        if {$loops > 10} {
+                putlog "bMotion: ALERT! looping too much in %VERB code with $line"
+                set line "/has a tremendous error while trying to sort something out :("
+        }
+        # set line [bMotionInsertString $line "%VERB\{$BOOM\}" [bMotionMakeVerb $BOOM]]
+        regsub -nocase "%VERB\{$BOOM\}" $line [bMotionMakeVerb $BOOM] line
+}
+
+set loops 0
+while {[regexp -nocase "%PLURAL\{(.*?)\}" $line matches BOOM]} {
+        incr loops
+        if {$loops > 10} {
+                putlog "bMotion: ALERT! looping too much in %PLURAL code with $line"
+                set line "/has a tremendous error while trying to sort something out :("
+        }
+        # set line [bMotionInsertString $line "%PLURAL\{$BOOM\}" [bMotionMakePlural $BOOM]]
+        regsub -nocase "%PLURAL\{$BOOM\}" $line [bMotionMakePlural $BOOM] line
+}
+
+set loops 0
+while {[regexp -nocase "%REPEAT\{(.+?)\}" $line matches BOOM]} {
+        incr loops
+        if {$loops > 10} {
+                putlog "bMotion: ALERT! looping too much in %REPEAT code with $line"
+                set line "/has a tremendous error while trying to sort something out :("
+        }
+        set replacement [bMotionMakeRepeat $BOOM]
+        regsub -nocase "%REPEAT\\{$BOOM\\}" $line $replacement line
+}
+
+return $line
 }
 
@@ -397 +397 @@
         bMotion_putloglev 5 * "bMotionSayLine: channel = $channel, nick = $nick, line = $line, moreText = $moreText, noTypo = $noTypo"
         global mood botnick bMotionInfo bMotionCache bMotionOriginalInput
-                global bMotion_output_delay
+        global bMotion_output_delay
 
         set line [bMotionInterpolation2 $line]
@@ -408 +408 @@
                 set dobreak 0
                 if {$botcmd == "bot"} {
-                        #random
+                #random
                         bMotion_putloglev 1 * "bMotion: %bot detected"
                         regexp {%bot\[([[:digit:]]+),(@[^,]+,)?(.+)\]} $line matches chance condition cmd
@@ -420 +420 @@
                         }
                 } else {
-                        #non-random
-                        regexp {%BOT\[(@[^,]+,)?(.+)\]} $line matches condition cmd
+                #non-random
+                regexp {%BOT\[(@[^,]+,)?(.+)\]} $line matches condition cmd
                 }
 
@@ -452 +452 @@
 
         if [regexp {%DELAY\{([0-9]+)\}} $line matches delay] {
-                        set bMotion_output_delay $delay
-                        bMotion_putloglev d * "Changing output delay to $delay"
-                        set line ""
+                set bMotion_output_delay $delay
+                bMotion_putloglev d * "Changing output delay to $delay"
+                set line ""
         }
 
@@ -482 +482 @@
                                 }
                                 if {$result == ""} {
-                                                return 0
+                                        return 0
                                 }
                                 set line $result
@@ -494 +494 @@
         }
 
-                if {[string index $line end] == " "} {
-                                set line [string range $line 0 end-1]
-                }
+        if {[string index $line end] == " "} {
+                set line [string range $line 0 end-1]
+        }
 
         #check if this line matches the last line said on IRC
@@ -504 +504 @@
                 return 0
         }
-                
-                #protect this block - it'll generate an error if noone's talked yet, and then
-                #we try an admin plugin
-                if [info exists bMotionOriginalInput] {
-                                if [string match -nocase $bMotionOriginalInput $line] {
-                                                bMotion_putloglev 1 * "my output matches the trigger, dropping"
-                                                return 0
-                                }
-                }
-
-        set line [bMotionInsertString $line "%slash" "/"]
-
-                global bMotion_output_delay
-
-        if [regexp "^/" $line] {
-                #it's an action
-                mee $channel [string range $line 1 end] $urgent
+
+        #protect this block - it'll generate an error if noone's talked yet, and then
+        #we try an admin plugin
+        if [info exists bMotionOriginalInput] {
+        if [string match -nocase $bMotionOriginalInput $line] {
+        bMotion_putloglev 1 * "my output matches the trigger, dropping"
+        return 0
+        }
+        }
+
+set line [bMotionInsertString $line "%slash" "/"]
+
+global bMotion_output_delay
+
+if [regexp "^/" $line] {
+#it's an action
+        mee $channel [string range $line 1 end] $urgent
+} else {
+        if {$urgent} {
+                bMotion_queue_add_now [chandname2name $channel] $line
         } else {
-                if {$urgent} {
-                        bMotion_queue_add_now [chandname2name $channel] $line
-                } else {
-                        bMotion_queue_add [chandname2name $channel] $line $bMotion_output_delay
-                }
-        }
-        return 0
+                bMotion_queue_add [chandname2name $channel] $line $bMotion_output_delay
+        }
+}
+return 0
 }
 
 proc bMotionInsertString {line swapout toInsert} {
-                bMotion_putloglev 5 * "bMotionInsertString ($line, $swapout, $toInsert)"
+        bMotion_putloglev 5 * "bMotionInsertString ($line, $swapout, $toInsert)"
         set loops 0
         set inputLine $line
@@ -548 +548 @@
 
 proc bMotionGetColenChars {} {
-                bMotion_putloglev 5 * "bMotionGetColenChars"
+        bMotion_putloglev 5 * "bMotionGetColenChars"
         set randomChar "!£$%^*@#~"
 
@@ -569 +569 @@
 
 proc makeSmiley { mood } {
-                bMotion_putloglev 5 * "makeSmiley"
+        bMotion_putloglev 5 * "makeSmiley"
         if {$mood > 30} {
                 return ":D"
@@ -592 +592 @@
 #
 proc bMotionWashNick { nick } {
-                bMotion_putloglev 5 * "bMotionWashNick ($nick)"
+        bMotion_putloglev 5 * "bMotionWashNick ($nick)"
         #remove leading
         regsub {^[|`_\[]+} $nick "" nick
@@ -620 +620 @@
                 set handle [finduser $host]
                 if {$handle == "*"} {
-                        #not in bot
+                #not in bot
                         bMotion_putloglev 2 * "bMotion: no match, washing nick"
                         return [bMotionWashNick $nick]
@@ -633 +633 @@
         set realname [getuser $handle XTRA irl]
         if {$realname == ""} {
-                #not set
+        #not set
                 return [bMotionWashNick $nick]
         }
@@ -653 +653 @@
 
         if [validuser $nick] {
-                #it's a handle already
+        #it's a handle already
                 set handle $nick
         } else {
-                #try to figure it out
+        #try to figure it out
                 set handle [nick2hand $nick]
                 if {($handle == "") ||($handle == "*")} {
-                        #not in bot
+                #not in bot
                         bMotion_putloglev 2 * "bMotion: no match, using nick"
                         return $nick
@@ -670 +670 @@
         set realname [getuser $handle XTRA irl]
         if {$realname == ""} {
-                #not set
+        #not set
                 bMotion_putloglev 2 * "no IRL set, using nick"
                 return $nick
@@ -679 +679 @@
 
 proc bMotionTransformNick { target nick {host ""} } {
-                bMotion_putloglev 5 * "bMotionTransformNick($target, $nick, $host)"
+        bMotion_putloglev 5 * "bMotionTransformNick($target, $nick, $host)"
         set newTarget [bMotionTransformTarget $target $host]
         if {$newTarget == "me"} {
@@ -688 +688 @@
 
 proc bMotionTransformTarget { target {host ""} } {
-                bMotion_putloglev 5 * "bMotionTransformTarget($target, $host)"
+        bMotion_putloglev 5 * "bMotionTransformTarget($target, $host)"
         global botnicks
         if {$target != "me"} {
@@ -718 +718 @@
 #               * prev - return previously chosen user/bot
 proc bMotion_choose_random_user { channel bot condition } {
-        bMotion_putloglev 5 * "bMotion_choose_random_user ($channel, $bot, $condition)"
+        bMotion_putloglev 5 * "ruser: bMotion_choose_random_user ($channel, $bot, $condition)"
         global bMotionCache
         set users [chanlist $channel]
@@ -729 +729 @@
                         set what [array get bMotionCache "lastruser$bot"]
                 }
-                bMotion_putloglev 4 * "accept: prev ($what)"
+                bMotion_putloglev 4 * "ruser: accept: prev ($what)"
                 return [lindex $what 1]
         }
 
         foreach user $users {
-                bMotion_putloglev 4 * "eval user $user"
+                bMotion_putloglev 4 * "ruser: eval user $user"
                 #is it me?
-                if [isbotnick $user] { continue }
+                if [isbotnick $user] { 
+                        bMotion_putloglev 4 * "ruser:  that's me"
+                        continue 
+                }
 
                 if {[bMotion_setting_get "bitlbee"] && ($user == "root")} {
-                        bMotion_putloglev 4 * "  --reject: bitlbee root user"
+                        bMotion_putloglev 4 * "ruser:  reject: bitlbee root user"
                         continue
                 }
@@ -746 +749 @@
                 #get their handle
                 set handle [nick2hand $user $channel]
-                bMotion_putloglev 4 * "  handle: $handle"
+                bMotion_putloglev 4 * "ruser:  handle: $handle"
 
                 # some people don't like interacting with the bot
                 if [matchattr $handle J] {
-                        bMotion_putloglev 4 * "  --reject: user is +J"
+                        bMotion_putloglev 4 * "ruser:  reject: user is +J"
                         continue
                 }
@@ -756 +759 @@
                 #unless we're looking for any old user, we'll need handle
                 if {(($handle == "") || ($handle == "*")) && ($condition != "")} {
-                        bMotion_putloglev 4 * "  --reject: no handle"
+                        bMotion_putloglev 4 * "ruser:  reject: no handle"
                         continue
                 }
@@ -763 +766 @@
                 #we don't want a bot, then use nick
                 if {(($handle == "") || ($handle == "*")) && ($condition == "") && ($bot == 0)} {
-                        bMotion_putloglev 4 * "  ++accept: $user (no handle)"
+                        bMotion_putloglev 4 * "ruser:  accept: $user (no handle)"
                         lappend acceptable $user
                         continue
@@ -771 +774 @@
                 if {$bot == 1} {
                         if {![matchattr $handle b]} {
-                                bMotion_putloglev 4 * "  --reject: not a bot"
+                                bMotion_putloglev 4 * "ruser:  reject: not a bot"
                                 continue
                         }
@@ -777 +780 @@
                         global bMotion_interbot_otherbots
                         if {[lsearch [array names bMotion_interbot_otherbots] $handle] == -1} {
-                                bMotion_putloglev 4 * "  --reject: not a bmotion bot"
+                                bMotion_putloglev 4 * "ruser:  reject: not a bmotion bot"
                                 continue
                         }
                         #else add them
                         lappend acceptable $user
-