Changeset 949

Timestamp:

13/08/2008 12:09:19 (4 months ago)

Author:

james

Message:

all manner of wonderful things

Location:

trunk/modules

Files:

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

trunk/modules/abstracts/en/abstracts.tcl

@@ -511 +511 @@
 
 bMotion_abstract_register "randomReplies" {
+        "You are a bottomless pit of questions."
         "You can lead a horse to water, but you are the one asking all the stupid questions!"
         "%ruser"
@@ -2840 +2841 @@
         "i say"
         "lordy"
+        "gosh"
+        "wowsers"
 }
 
@@ -2859 +2862 @@
         "O_O"
         "A%REPEAT{4:7:R}GH!"
+        "gosh"
+        "good heavens"
+        "well i never"
 }
 

trunk/modules/abstracts/en/randomstuff.tcl

@@ -6 +6 @@
 ### Used when the channel is not 'active' (default > 300s since last line)
 bMotion_abstract_register "randomStuff" {
+        "where do you have sex with a cake?"
+        "Grab a shovel. I'm one skull short of a goldfish."
+        "Life is a mammal that barks and shits on the floor of my broken heart and i don't think that's funny"
+        "I am a summer soup, mmm"
+        "I'm not mexican enough to be beaten up by a car"
         "If it wasn't for herpes, I wouldn't have any appointments. "
         "it looks like you're writing a letter!"
@@ -308 +313 @@
         "My hovercraft is full of %PLURAL{%VAR{sillyThings}{strip}}"
         "I never make mistakes! Syntax error in line %NUMBER{100}0. Redo from start."
+        "you wouldn't steal a handbag%|you wouldn't steal a car%|you wouldn't steal %VAR{sillyThings}!%|you wouldn't shoot a policeman, and then steal his %VAR{sillyThings}{strip}%|you wouldn't go to the toilet in it and then send it to the policeman's grieving widow%|and then steal it again!%|downloading films is stealing!"
+        "you wouldn't steal a handbag%|you wouldn't steal a car%|you wouldn't steal %VAR{sillyThings}!%|downloading films is stealing!"
+        "my %VAR{bodypart} goes sideways"
+        "adventure follows me like a dog follows a man with bacon trousers"
+        "i'm giving up evil science and taking up even gardening instead"
+        "noooo! enormous naked buttocks heading towards my head!%|i'm being simultaneously crushed and embarrassed to death"
+        "yay! %VAR{bodypart}s!"
 }
 
@@ -315 +327 @@
 ### Mixed in with list above
 bMotion_abstract_register "randomStuff_male" {
+        "so i couldn't tell what it was and it smelled really bad but i ate it anyway%|then i just licked my balls until they hurt"
         "Come on baby, let's go play schoolgirl and guy who has sex with schoolgirls!"
         "i think %PLURAL{%VAR{sillyThings}{strip}} should have holes you can put your cock in"
@@ -331 +344 @@
         "These girls are ace. And their racoon is ace."
         "hi %ruser! I'm miniature superman!%|no %ruser{prev}, don't touch me there!%|n%REPEAT{5:15:o}! %VAR{unsmiles}"
+        "May I come now?%|%BOT\[No, wait\]%|Too late.%|Sorry about your dress"
+        "Est-ce que je peux venir maintenant?%|%BOT\[Non, attends.\]%|Trop trad%|Desole pour ta robe"
+        "no touchy touchy%|no rubby rubby patty%|and no looky looky touchy"
 }
 
 bMotion_abstract_register "randomStuff_female" {
+        "excuse me, i need to go powder my ... nose"
         "I'm the sort of girl who goes to the pub with your mates%|and ends the night with an empty mates packet."
         "This one time, at band camp, I put a flute..."
@@ -413 +430 @@
 ### Used when the channel is 'active' (default < 300 sec since last line)
 bMotion_abstract_register "activeRandomStuff" {
+"You will be a winner today. Pick a fight with a four-year-old."
         "you've got no piss control!"
         "So anyway, I'm really attracted to you pardner! Yee haw! Did you like lesbians?"
@@ -490 +508 @@
         "who... does... number... two... work... for?"
         "you show that turd who's boss"
+        "i've been to some conventions like that"
 }
 

trunk/modules/events.tcl

@@ -251 +251 @@
 
   #if we spoke last, add "$botnick: " if it's not in the line 
-  if {![regexp -nocase $botnicks $text] && ([bMotion_did_i_speak_last $channel] || [bMotion_setting_get "bitlbee"])} {
+  if {![regexp -nocase $botnicks $text] && ([bMotion_did_i_speak_last $channel] || ([bMotion_setting_get "bitlbee"] == "1"))} {
         if [regexp {^[^:]+:.+} $text] {
                         #since our nick isn't in the line and they're addressing someone, drop this line
@@ -259 +259 @@
   }
  
-  if [bMotion_setting_get "bitlbee"] {
+  if {[bMotion_setting_get "bitlbee"] == "1"} {
     bMotion_putloglev d * "bitlbee incoming from $nick: $text"
   }

trunk/modules/interbot.tcl

@@ -336 +336 @@
   bMotion_putloglev d * "interbot: Met bMotion bot $bot on channels $channels"
   putbot $bot "bmotion SUP $bMotionChannels"
-  array unset bMotion_interbot_otherbots dummy
 }
 
@@ -352 +351 @@
   set bMotion_interbot_otherbots($bot) $channels
   bMotion_putloglev d * "interbot: bMotion bot $bot on channels $channels"
-  array unset bMotion_interbot_otherbots dummy
-}
-
-set bMotion_interbot_otherbots(dummy) ""
+}
+
+array set bMotion_interbot_otherbots {}
 
 # bMotion_interbot_resync
@@ -372 +370 @@
         bMotion_update_chanlist
   unset bMotion_interbot_otherbots
-  set bMotion_interbot_otherbots(dummy) ""
+  array set bMotion_interbot_otherbots {}
 
   putloglev d * "interbot: Resyncing with botnet for bMotion bots"

trunk/modules/output.tcl

@@ -806 +806 @@
                 }
 
-                if {[bMotion_setting_get "bitlbee"] && ($user == "root")} {
+                if {([bMotion_setting_get "bitlbee"] == "1") && ($user == "root")} {
                         bMotion_putloglev 4 * "ruser:  reject: bitlbee root user"
                         continue

trunk/modules/queue.tcl

@@ -42 +42 @@
 proc bMotion_queue_run { {force 0} } {
   global bMotion_queue bMotion_queue_runny
+
+        bMotion_putloglev 4 * "bMotion_queue_run $force"
 
         if {$bMotion_queue_runny == 0} {