Changeset 1137 for trunk

Timestamp:

02/04/12 17:25:10 (4 months ago)

Author:

znx

Message:

clear batchadd and whitespace cleanup

Location:

trunk/plugins/en

Files:

• action_complex_attack.tcl (modified) (2 diffs)
• action_complex_away.tcl (modified) (3 diffs)
• action_complex_failsafe.tcl (modified) (2 diffs)
• action_complex_fucks.tcl (modified) (1 diff)
• action_complex_hands.tcl (modified) (2 diffs)
• action_complex_hands_dildo.tcl (modified) (4 diffs)
• action_complex_hugs.tcl (modified) (1 diff)
• action_complex_lifts.tcl (modified) (2 diffs)
• action_complex_light.tcl (modified) (3 diffs)
• action_complex_misc.tcl (modified) (2 diffs)
• action_complex_rolls.tcl (modified) (1 diff)
• action_complex_shows.tcl (modified) (5 diffs)
• action_complex_smacks.tcl (modified) (3 diffs)
• action_complex_waves.tcl (modified) (1 diff)
• action_simple_squeeze.tcl (modified) (1 diff)
• complex_abbr.tcl (modified) (5 diffs)
• complex_action_hands_dildo.tcl (modified) (4 diffs)
• complex_activate.tcl (modified) (1 diff)
• complex_asl.tcl (modified) (1 diff)
• complex_bhar.tcl (modified) (1 diff)
• complex_chomp.tcl (modified) (1 diff)
• complex_correct.tcl (modified) (1 diff)
• complex_crap.tcl (modified) (3 diffs)
• complex_eitheror.tcl (modified) (1 diff)
• complex_fact.tcl (modified) (1 diff)
• complex_fry.tcl (modified) (1 diff)
• complex_fuckoff.tcl (modified) (1 diff)
• complex_getfact.tcl (modified) (5 diffs)
• complex_gollum.tcl (modified) (1 diff)
• complex_hand.tcl (modified) (3 diffs)
• complex_hello.tcl (modified) (2 diffs)
• complex_invader.tcl (modified) (6 diffs)
• complex_joker.tcl (modified) (2 diffs)
• complex_knockknock.tcl (modified) (1 diff)
• complex_les.tcl (modified) (1 diff)
• complex_love.tcl (modified) (1 diff)
• complex_nazi.tcl (modified) (1 diff)
• complex_nightmare.tcl (modified) (1 diff)
• complex_pack.tcl (modified) (1 diff)
• complex_pants.tcl (modified) (1 diff)
• complex_phonetic.tcl (modified) (4 diffs)
• complex_pokemon.tcl (modified) (1 diff)
• complex_questions.tcl (modified) (5 diffs)
• complex_readings.tcl (modified) (3 diffs)
• complex_replicate.tcl (modified) (1 diff)
• complex_scrap.tcl (modified) (19 diffs)
• complex_sex.tcl (modified) (2 diffs)
• complex_snap.tcl (modified) (1 diff)
• complex_sosyour.tcl (modified) (1 diff)
• complex_spoonerism.tcl (modified) (1 diff)
• complex_sport.tcl (modified) (7 diffs)
• complex_summon.tcl (modified) (7 diffs)
• complex_supermarkets.tcl (modified) (1 diff)
• complex_taunt.tcl (modified) (2 diffs)
• complex_techsupport.tcl (modified) (5 diffs)
• complex_trivia.tcl (modified) (1 diff)
• complex_unf.tcl (modified) (1 diff)
• complex_want_catch.tcl (modified) (5 diffs)
• complex_wins.tcl (modified) (1 diff)
• complex_woot.tcl (modified) (1 diff)
• complex_worried.tcl (modified) (1 diff)
• complex_wrong_console.tcl (modified) (2 diffs)
• irc_join.tcl (modified) (2 diffs)
• irc_nick_away.tcl (modified) (1 diff)
• irc_quit.tcl (modified) (2 diffs)
• output_NUMBER.tcl (modified) (1 diff)
• output_SETTING.tcl (modified) (1 diff)
• output_SMILEY.tcl (modified) (1 diff)
• output_TIME.tcl (modified) (1 diff)
• output_VAR.tcl (modified) (3 diffs)
• output_censor.tcl (modified) (1 diff)
• output_channel.tcl (modified) (1 diff)
• output_demon.tcl (modified) (1 diff)
• output_ebonics.tcl (modified) (1 diff)
• output_english.tcl (modified) (1 diff)
• output_homophone.tcl (modified) (2 diffs)
• output_preprocess.tcl (modified) (1 diff)
• output_rbot.tcl (modified) (1 diff)
• output_ruser.tcl (modified) (1 diff)
• output_stop.tcl (modified) (1 diff)
• output_switch.tcl (modified) (1 diff)
• output_typos.tcl (modified) (2 diffs)
• simple_general.tcl (modified) (1 diff)
• simple_here.tcl (modified) (1 diff)
• simple_ick.tcl (modified) (5 diffs)
• simple_list.tcl (modified) (1 diff)
• simple_littlebit.tcl (modified) (1 diff)
• simple_notbot.tcl (modified) (1 diff)
• simple_notlong.tcl (modified) (1 diff)
• simple_sneeze.tcl (modified) (2 diffs)

trunk/plugins/en/action_complex_attack.tcl

@@ -13 +13 @@
 bMotion_plugin_add_action_complex "attacks" "^attacks (.+) with " 100 bMotion_plugin_complex_action_attack "en"
 
-proc bMotion_plugin_complex_action_attack { nick host handle channel text } {  
-        if {![bMotion_interbot_me_next $channel]} { 
-                return 1 
+proc bMotion_plugin_complex_action_attack { nick host handle channel text } {
+        if {![bMotion_interbot_me_next $channel]} {
+                return 1
         }
         set damage [rand 1500]
@@ -28 +28 @@
 }
 
-bMotion_abstract_register "attack_responses"
-bMotion_abstract_batchadd "attack_responses" {
+bMotion_abstract_register "attack_responses" {
         "%% attacks %SETTING{complex:attacks:who:_:_} with '%SETTING{complex:attacks:item:_:_}' for %SETTING{complex:attacks:score:_:_} damage."
         "%SETTING{complex:attacks:who:_:_} takes %SETTING{complex:attacks:score:_:_} damage from %OWNER{%%} '%SETTING{complex:attacks:item:_:_}'"

trunk/plugins/en/action_complex_away.tcl

@@ -38 +38 @@
   #save as newnick because if they do a /me next it'll be their new nick
   bMotion_plugins_settings_set "complex:away" "lastnick" $channel "" $nick
-  
+
   #autoaway
   if [regexp -nocase "(auto( |-)?away|idle)" $text] {
@@ -75 +75 @@
     return 1
   }
-    
+
   bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{cyas}"
   return 1
@@ -104 +104 @@
 
   bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{welcomeBacks}"
-  
+
         bMotion_plugins_settings_set "system:join" "lastgreeted" $channel "" $nick
   return 1

trunk/plugins/en/action_complex_failsafe.tcl

@@ -52 +52 @@
                 bMotionGetHorny
                 driftFriendship $nick 10
-        } 
+        }
 
 
@@ -131 +131 @@
 }
 
-bMotion_abstract_register "failsafe_nice"
-bMotion_abstract_batchadd "failsafe_nice" [list "mmm" "%VAR{smiles}" "%VAR{smiles}%|/gives %% %VAR{sillyThings}" "i do love a good %2ing"]
+bMotion_abstract_register "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 ( ? )" "i do love a good %%ing"]
+bMotion_abstract_register "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}" "/%VAR{sillyThings:verb,strip} %2 %SETTING{complex:failsafe:last:nick:moo} in the %VAR{bodypart:bothmixin}" "/%VAR{sillyThings:verb,strip} %2 %SETTING{complex:failsafe:last:nick:moo} in return" "i do love a good %%ing"]
+bMotion_abstract_register "failsafes_b" [list "/%% %2 %SETTING{complex:failsafe:last:nick:moo} back with %VAR{sillyThings}" "/%% %2 %SETTING{complex:failsafe:last:nick:moo}" "/%VAR{sillyThings:verb,strip} %2 %SETTING{complex:failsafe:last:nick:moo} in the %VAR{bodypart:bothmixin}" "/%VAR{sillyThings:verb,strip} %2 %SETTING{complex:failsafe:last:nick:moo} in return" "i do love a good %%ing"]
 bMotion_abstract_add_filter "failsafes_b" "%VERB"
 
-bMotion_abstract_register "squeezeds"
-bMotion_abstract_batchadd "squeezeds" [list "/pops" "/bursts" "/is compressed to a singularity and sucks in all of spacetime%|whoops" "/deflates" "%VAR{smiles}"]
+bMotion_abstract_register "squeezeds" [list "/pops" "/bursts" "/is compressed to a singularity and sucks in all of spacetime%|whoops" "/deflates" "%VAR{smiles}"]
 
-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 "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_lookback" [list "/stares at %%" "hello, yes?" "i can still see you..." "/poses" "/bounces away" "%VAR{smiles}" "/looks at %%" ]
 
-bMotion_abstract_register "failsafe_niceactions"
-bMotion_abstract_batchadd "failsafe_niceactions" [list "wh%REPEAT{3:7:e} %VAR{smiles}" "%VAR{smiles}" "/bounces around" "*drool*" ]
+bMotion_abstract_register "failsafe_wtfs" [list "%VAR{satOns}" "%VAR{shocked}" ]
+
+bMotion_abstract_register "failsafe_niceactions" [list "wh%REPEAT{3:7:e} %VAR{smiles}" "%VAR{smiles}" "/bounces around" "*drool*" ]
 
 bMotion_abstract_register "sillyVerbs"

trunk/plugins/en/action_complex_fucks.tcl

@@ -21 +21 @@
                         frightened $nick $channel
                         return 1
-                }                
+                }
 
                 if [bMotionLike $nick $host] {

trunk/plugins/en/action_complex_hands.tcl

@@ -67 +67 @@
                         }
                         return 1
-                } 
+                }
                 #end of "hands dildo"
 
@@ -120 +120 @@
                 }
                 return 1
-        } 
+        }
         #end of "hands" handler
 }

trunk/plugins/en/action_complex_hands_dildo.tcl

@@ -46 +46 @@
     }
 
-    #play with it 
+    #play with it
     #TODO: Rationalise this!
     if {$got(dildo,count) == 1} {
@@ -59 +59 @@
 
     if {[bMotionGetGender $nick $host] == "male"} {
-      #-- hander is male          
+      #-- hander is male
       if [string match -nocase "*flute*" $item] {
         bMotionDoAction $channel $item "%VAR{dildoFlutePlays}" $nick
@@ -129 +129 @@
         return 0
       } else {
-        bMotionDoAction $channel $nick "%VAR{dildoMaleMale}" $item            
+        bMotionDoAction $channel $nick "%VAR{dildoMaleMale}" $item
         #take turns
         set useTimer 1
@@ -149 +149 @@
         set useTimer 1
         set style "normal"
-      }          
-    } 
+      }
+    }
     #male bot, female hander
     bMotion_putloglev 1 * "bMotion: dildo (male) timer starting"

trunk/plugins/en/action_complex_hugs.tcl

@@ -14 +14 @@
 bMotion_plugin_add_action_complex "hugs" "^(hugs|snuggles|huggles|knuffelt) %botnicks" 100 bMotion_plugin_complex_action_hugs "en"
 
-proc bMotion_plugin_complex_action_hugs { nick host handle channel text } {  
+proc bMotion_plugin_complex_action_hugs { nick host handle channel text } {
   bMotionGetUnLonely
   bMotionGetHappy

trunk/plugins/en/action_complex_lifts.tcl

@@ -30 +30 @@
 }
 
-bMotion_abstract_register "nolift_channel_response"
-bMotion_abstract_batchadd "nolift_channel_response" {
+bMotion_abstract_register "nolift_channel_response" {
         "hmmmph %SMILEY{sad}"
         "OI! Don't do that"
@@ -39 +38 @@
 }
 
-bMotion_abstract_register "lift_channel_response"
-bMotion_abstract_batchadd "lift_channel_response" {
+bMotion_abstract_register "lift_channel_response" {
         "Weeeeeeeeeeeeeeeeeeeee, do that again!"
         "Ooo aren't we strong"

trunk/plugins/en/action_complex_light.tcl

@@ -16 +16 @@
 bMotion_plugin_add_action_complex "light2" "^sets %botnicks (alight|on fire)" 100 bMotion_plugin_complex_action_light "en"
 
-proc bMotion_plugin_complex_action_light { nick host handle channel text } {  
+proc bMotion_plugin_complex_action_light { nick host handle channel text } {
   bMotionDoAction $channel $nick "%VAR{burns}"
   bMotionGetUnLonely
@@ -23 +23 @@
 }
 
-bMotion_abstract_register "burns"
-bMotion_abstract_batchadd "burns" {
+bMotion_abstract_register "burns" {
   "/burns%|%bot[50,¬VAR{extinguishes}]"
   "*flames*%|%bot[50,¬VAR{extinguishes}]"
@@ -40 +39 @@
 }
 
-bMotion_abstract_register "extinguishes"
-bMotion_abstract_batchadd "extinguishes" {
+bMotion_abstract_register "extinguishes" {
   "/puts %% out"
   "/pours water on %%"

trunk/plugins/en/action_complex_misc.tcl

@@ -14 +14 @@
 bMotion_plugin_add_action_complex "freshens" "^freshens %botnicks" 100 bMotion_plugin_complex_action_freshen "en"
 
-proc bMotion_plugin_complex_action_freshen { nick host handle channel text } {  
+proc bMotion_plugin_complex_action_freshen { nick host handle channel text } {
         global botnicks
         if [regexp -nocase "freshens ${botnicks}('s (.+))?" $text matches 1 2 what] {
@@ -42 +42 @@
 bMotion_plugin_add_action_complex "fallsout" "^falls out with %botnicks" 100 bMotion_plugin_complex_action_fallsout "en"
 
-proc bMotion_plugin_complex_action_fallsout { nick host handle channel text } {  
+proc bMotion_plugin_complex_action_fallsout { nick host handle channel text } {
         if [bMotionIsFriend $nick] {
                 bMotionDoAction $channel $nick "%VAR{felloutfriend}"

trunk/plugins/en/action_complex_rolls.tcl

@@ -20 +20 @@
 }
 
-bMotion_abstract_register "rolls_channel_response"
-bMotion_abstract_batchadd "rolls_channel_response" {
+bMotion_abstract_register "rolls_channel_response" {
         "keep them doggies rolling RAWHIDE"
         "rolls a joint"

trunk/plugins/en/action_complex_shows.tcl

@@ -88 +88 @@
 # abstracts
 
-bMotion_abstract_register "show_amazements"
-bMotion_abstract_batchadd "show_amazements" {
+bMotion_abstract_register "show_amazements" {
   "amazement"
   "astonishment"
@@ -98 +97 @@
 }
 
-bMotion_abstract_register "show_whoas"
-bMotion_abstract_batchadd "show_whoas" {
+bMotion_abstract_register "show_whoas" {
   "whoa"
   "wow"
@@ -108 +106 @@
 }
 
-bMotion_abstract_register "show_comparisons"
-bMotion_abstract_batchadd "show_comparisons" {
+bMotion_abstract_register "show_comparisons" {
   "bigger"
   "smaller"
@@ -128 +125 @@
 }
 
-bMotion_abstract_register "show_adjectives"
-bMotion_abstract_batchadd "show_adjectives" {
+bMotion_abstract_register "show_adjectives" {
   "shiny"
   "pretty"
@@ -139 +135 @@
 }
 
-bMotion_abstract_register "show_generic"
-bMotion_abstract_batchadd "show_generic" {
+bMotion_abstract_register "show_generic" {
   "/gasps in %VAR{show_amazements}"
   "%VAR{show_whoas}%colen"

trunk/plugins/en/action_complex_smacks.tcl

@@ -33 +33 @@
 }
 
-bMotion_abstract_register "trouts"
-bMotion_abstract_batchadd "trouts" {
+bMotion_abstract_register "trouts" {
         "/slaps %% back using a default menu command"
         "%VAR{goAways}"
@@ -43 +42 @@
 }
 
-bMotion_abstract_register "slapped"
-bMotion_abstract_batchadd "slapped" {
+bMotion_abstract_register "slapped" {
         "ow hey! that was my %VAR{counts} %VAR{bodypart} %VAR{unsmiles}"
         "ow! that was my %VAR{counts} %VAR{bodypart} %VAR{unsmiles}"
@@ -64 +62 @@
 }
 
-bMotion_abstract_register "counts"
-bMotion_abstract_batchadd "counts" {
+bMotion_abstract_register "counts" {
         "last"
         "penultimate"

trunk/plugins/en/action_complex_waves.tcl

@@ -29 +29 @@
 }
 
-bMotion_abstract_register "waveTooMuch"
-bMotion_abstract_batchadd "waveTooMuch" [list "What." "Are you practicing to be the Queen or something?" "..."]
+bMotion_abstract_register "waveTooMuch" [list "What." "Are you practicing to be the Queen or something?" "..."]

trunk/plugins/en/action_simple_squeeze.tcl

@@ -14 +14 @@
 bMotion_plugin_add_action_simple "squeeze" "^(squeezes|beeps|honks|knijpt( in)?) %botnicks" 100 "%VAR{honks}" "en"
 
-bMotion_abstract_register "honks"
-bMotion_abstract_batchadd "honks" {
+bMotion_abstract_register "honks" {
   "/honks"
   "/beeps"

trunk/plugins/en/complex_abbr.tcl

@@ -41 +41 @@
 bMotion_plugin_add_complex "abbr" "^!abbr" 100 bMotion_plugin_complex_abbr "en"
 
-bMotion_abstract_register "abbr_nouns"
-bMotion_abstract_batchadd "abbr_nouns" {
+bMotion_abstract_register "abbr_nouns" {
   "mullet"
   "cheese"
@@ -53 +52 @@
 }
 
-bMotion_abstract_register "abbr_adj"
-bMotion_abstract_batchadd "abbr_adj" {
+bMotion_abstract_register "abbr_adj" {
   "hot" "cold" "purple" "clean" "freezing" "thooper" "white" "starchy" "bavarian" "woolly" "blippy" "decent" "smart" "coloured" "flavoured" "norwegian" "swede" "brit" "dutchman" "american" "canadian" "german"
 }
 
-bMotion_abstract_register "abbr_verbs"
-bMotion_abstract_batchadd "abbr_verbs" {
+bMotion_abstract_register "abbr_verbs" {
   "wielding"
   "powered"
@@ -67 +64 @@
 
 
-bMotion_abstract_register "abbr_adult_nouns_t"
-bMotion_abstract_batchadd "abbr_adult_nouns_t" {
+bMotion_abstract_register "abbr_adult_nouns_t" {
   "sex"
   "vibrator"
@@ -76 +72 @@
 }
 
-bMotion_abstract_register "abbr_adult_adj_t"
-bMotion_abstract_batchadd "abbr_adult_adj_t" {
+bMotion_abstract_register "abbr_adult_adj_t" {
   "thexy" "horny"
   "hot" "moist" "wet" "lubricated"
 }
 
-bMotion_abstract_register "abbr_adult_verbs_t"
-bMotion_abstract_batchadd "abbr_adult_verbs_t" {
+bMotion_abstract_register "abbr_adult_verbs_t" {
   "licking"
   "moaning"
@@ -90 +84 @@
 
 #create the big lists :)
-bMotion_abstract_register "abbr_adult_nouns"
-bMotion_abstract_batchadd "abbr_adult_nouns" {
+bMotion_abstract_register "abbr_adult_nouns" {
   "%VAR{abbr_nouns}"
   "%VAR{abbr_adult_nouns_t}"
 }
 
-bMotion_abstract_register "abbr_adult_verbs"
-bMotion_abstract_batchadd "abbr_adult_verbs" {
+bMotion_abstract_register "abbr_adult_verbs" {
   "%VAR{abbr_verbs}"
   "%VAR{abbr_adult_verbs_t}"
 }
 
-bMotion_abstract_register "abbr_adult_adj"
-bMotion_abstract_batchadd "abbr_adult_adj" {
+bMotion_abstract_register "abbr_adult_adj" {
   "%VAR{abbr_adj}"
   "%VAR{abbr_adult_adj_t}"

trunk/plugins/en/complex_action_hands_dildo.tcl

@@ -46 +46 @@
     }
 
-    #play with it 
+    #play with it
     #TODO: Rationalise this!
     if {$got(dildo,count) == 1} {
@@ -59 +59 @@
 
     if {[bMotionGetGender $nick $host] == "male"} {
-      #-- hander is male          
+      #-- hander is male
       if [string match -nocase "*flute*" $item] {
         bMotionDoAction $channel $item "%VAR{dildoFlutePlays}" $nick
@@ -129 +129 @@
         return 0
       } else {
-        bMotionDoAction $channel $nick "%VAR{dildoMaleMale}" $item            
+        bMotionDoAction $channel $nick "%VAR{dildoMaleMale}" $item
         #take turns
         set useTimer 1
@@ -149 +149 @@
         set useTimer 1
         set style "normal"
-      }          
-    } 
+      }
+    }
     #male bot, female hander
     bMotion_putloglev 1 * "bMotion: dildo (male) timer starting"

trunk/plugins/en/complex_activate.tcl

@@ -30 +30 @@
 }
 
-bMotion_abstract_register "activateses"
-bMotion_abstract_batchadd "activateses" {
+bMotion_abstract_register "activateses" {
   "/increases power to %%"
   "/brings %% online"

trunk/plugins/en/complex_asl.tcl

@@ -12 +12 @@
 
 bMotion_plugin_add_complex "asl" {\ma/?s/?l\??\M} 100 bMotion_plugin_complex_asl "en"
-  
+
 proc bMotion_plugin_complex_asl { nick host handle channel text } {
   if {[bMotionTalkingToMe $text] || [rand 2]} {

trunk/plugins/en/complex_bhar.tcl

@@ -20 +20 @@
     bMotionDoAction $channel $nick "%VAR{arrs}"
     return 1
-  }  
+  }
 }
 
-bMotion_abstract_register "arrs"
-bMotion_abstract_batchadd "arrs" {
+bMotion_abstract_register "arrs" {
   "bhar"
   "boohar"

trunk/plugins/en/complex_chomp.tcl

@@ -13 +13 @@
 bMotion_plugin_add_complex "chomp" "^%botnicks,?:? ?(please )?chomp" 100 bMotion_plugin_complex_chomp "en"
 
-proc bMotion_plugin_complex_chomp { nick host handle channel text } {  
+proc bMotion_plugin_complex_chomp { nick host handle channel text } {
   global botnicks
   if [regexp -nocase "^$botnicks,?:? ?(please )?chomp (.+)" $text matches ming ming2 who] {

trunk/plugins/en/complex_correct.tcl

@@ -24 +24 @@
 }
 
-bMotion_abstract_register "shouldhaves"
-bMotion_abstract_batchadd "shouldhaves" {
+bMotion_abstract_register "shouldhaves" {
   "\"%% have\" %VAR{smiles}"
   "%% what?"

trunk/plugins/en/complex_crap.tcl

@@ -1 +1 @@
 #
 # vim: fdm=indent fdn=1
-#
-# Altered to new style bMotion_abstract_register/batchadd by Mark Sangster
 
 ###############################################################################
@@ -34 +32 @@
 bMotion_abstract_add_filter "random_crap_main" "\$ruser"
 
-bMotion_abstract_register "random_crap_adj"
-bMotion_abstract_batchadd "random_crap_adj" {
+bMotion_abstract_register "random_crap_adj" {
          "lemon-flavoured"
          "tasty"
@@ -42 +39 @@
                                  "yummy"
   }
-  
-bMotion_abstract_register "random_crap_type"
-bMotion_abstract_batchadd "random_crap_type" {
+
+bMotion_abstract_register "random_crap_type" {
          "poop"
          "crap"

trunk/plugins/en/complex_eitheror.tcl

@@ -44 +44 @@
 }
 
-bMotion_abstract_register "eitherors"
-bMotion_abstract_batchadd "eitherors" [list "%%: %2" "/thinks%|%%: %2" "/ponders%|%%: %2" "/flips a coin%|%%: %2" "%%: %2%|Or you could just use a placebo" "%%: none of the above" "%%: actually, i think it's %VAR{sillyThings}"]
+bMotion_abstract_register "eitherors" [list "%%: %2" "/thinks%|%%: %2" "/ponders%|%%: %2" "/flips a coin%|%%: %2" "%%: %2%|Or you could just use a placebo" "%%: none of the above" "%%: actually, i think it's %VAR{sillyThings}"]

trunk/plugins/en/complex_fact.tcl

@@ -30 +30 @@
                 return 0
         }
-  
+
   if {[string range $text end end] == "?"} { return 0 }
   if [regexp -nocase {\m([^ !"]+)[!" ]+(is|was|==?|am) ?([a-z0-9 '_/-]+)} $text matches item blah fact] {

trunk/plugins/en/complex_fry.tcl

@@ -33 +33 @@
                         set response "%VAR{technically_worst}"
                 }
-                bMotionDoAction $channel $thing $response 
+                bMotionDoAction $channel $thing $response
                 return 1
         }

trunk/plugins/en/complex_fuckoff.tcl

@@ -34 +34 @@
 }
 
-bMotion_abstract_register "fuckYous"
-bMotion_abstract_batchadd "fuckYous" [list "stfu" "shut up, you %VAR{PROM}" "eh fuck you buddy" "lalala not listening" "suck my balls you %VAR{dNouns}-%VAR{dVerbs}ing %VAR{prom_first}-%VAR{prom_second}" "yeah, whatever *yawn*" "shut it" "leave me alone" "oh go poo a bottom"]
+bMotion_abstract_register "fuckYous" [list "stfu" "shut up, you %VAR{PROM}" "eh fuck you buddy" "lalala not listening" "suck my balls you %VAR{dNouns}-%VAR{dVerbs}ing %VAR{prom_first}-%VAR{prom_second}" "yeah, whatever *yawn*" "shut it" "leave me alone" "oh go poo a bottom"]

trunk/plugins/en/complex_getfact.tcl

@@ -1 @@
-# 
+#
 # vim: fdm=indent fdn=1
 
@@ -6 +6 @@
 # Copyright (C) Kevin Smith 2003
 #
-# This program is covered by the GPL, please refer the to LICENCE file in the 
-# distribution; further information can be found in the headers of the scripts 
-# in the modules directory. 
+# This program is covered by the GPL, please refer the to LICENCE file in the
+# distribution; further information can be found in the headers of the scripts
+# in the modules directory.
 ###############################################################################
 
@@ -15 +15 @@
 #
 # Usage:
-#       !fact  
-#       botname what do you know 
+#       !fact
+#       botname what do you know
 #       botname tell me something new
 
 bMotion_plugin_add_complex "getfact1" "^!fact" 100 bMotion_plugin_complex_get_fact "en"
-bMotion_plugin_add_complex "getfact2" "^%botnicks,?:? what do you know" 100 bMotion_plugin_complex_get_fact "en" 
+bMotion_plugin_add_complex "getfact2" "^%botnicks,?:? what do you know" 100 bMotion_plugin_complex_get_fact "en"
 bMotion_plugin_add_complex "getfact3" "^%botnicks,?:? tell me something new" 100 bMotion_plugin_complex_get_fact "en"
 
@@ -31 +31 @@
         set i [lindex $items [rand [llength $items]]]
         if {[regexp "what,(.+)" $i matches item]} {
-                #set item 
+                #set item
         }
         #set property $bMotionFacts(what,$item)
@@ -42 +42 @@
 }
 
-bMotion_abstract_register "get_fact_intros"
-bMotion_abstract_batchadd "get_fact_intros" {
+bMotion_abstract_register "get_fact_intros" {
   "I think I heard that"
   "last time I knew, "

trunk/plugins/en/complex_gollum.tcl

@@ -16 +16 @@
 proc bMotion_plugin_complex_gollum { nick host handle channel text } {
     bMotion_putloglev 2 * "bMotion: run complex_gollum,"
-    if {![bMotion_interbot_me_next $channel]} { 
+    if {![bMotion_interbot_me_next $channel]} {
         bMotion_putloglev 4 * "bMotion: would have run gollum, but not my turn"
-        return 0 
+        return 0
     }
     bMotion_putloglev 4 * "bMotion: my turn when running complex_gollum"
     bMotionDoAction $channel [bMotionGetRealName $nick $host] "%VAR{gollums}"
-    return 1 
+    return 1
     #this allows us to still respond to questions, right?
 }
 
-bMotion_abstract_register "gollums"
-bMotion_abstract_batchadd "gollums" [list "Foolishness!" "Stupid fat hobbit!" "We hates the fat hobbit! Him and his pots and pans and ropes." "Thieves. Thieves all!" "Stupid hobbit. Talking to %himherself like that. Not answering %himherself." "Yes. Sleep sweet sleep with our precious!" "Filthy little thief playing with our precious!" "If only fat hobbit would go away for a moment, we could go to master and take the precious away from him." "No! Must not take away our precious!" "We miss the song of the precious. We miss it. We wants it back!" "Everyone wants my precious. It's not fair! It's ours!" "Shiny, shiny." "pet it, yes. stroke it. mmm, nice, yes.%|nice precious, yes." ]
+bMotion_abstract_register "gollums" [list "Foolishness!" "Stupid fat hobbit!" "We hates the fat hobbit! Him and his pots and pans and ropes." "Thieves. Thieves all!" "Stupid hobbit. Talking to %himherself like that. Not answering %himherself." "Yes. Sleep sweet sleep with our precious!" "Filthy little thief playing with our precious!" "If only fat hobbit would go away for a moment, we could go to master and take the precious away from him." "No! Must not take away our precious!" "We miss the song of the precious. We miss it. We wants it back!" "Everyone wants my precious. It's not fair! It's ours!" "Shiny, shiny." "pet it, yes. stroke it. mmm, nice, yes.%|nice precious, yes." ]

trunk/plugins/en/complex_hand.tcl

@@ -31 +31 @@
       if { [string match -nocase "me" $who] } {
         bMotion_plugin_complex_hug_do $channel $nick $host
-      } else {  
+      } else {
         bMotion_plugin_complex_hug_do $channel $who $host
-      }  
+      }
     } else {
       bMotionDoAction $channel $nick "%%: I'm sorry, I don't know how to hug %VAR{unsmiles}"
@@ -45 +45 @@
   } else {
     set whom [bMotionGetRealName $who]
-  }  
+  }
 
   #your -> his/her
@@ -51 +51 @@
     set item "[getHisHers] [string range $item 5 end]"
   }
-  
+
   if [string match -nocase "something*" $item] {
     set item "%VAR{sillyThings}"
   }
-  
+
   bMotion_putloglev d * "bMotion: Handed $whom $item on $channel (from $nick)"
   bMotionDoAction $channel $nick "/gives $whom $item"

trunk/plugins/en/complex_hello.tcl

@@ -19 +19 @@
         set exclaim ""
         regexp -nocase "^${botnicks}(!+|\[!\"£\$%^&*()#\]{3,})" $text bling pop exclaim
-        global bMotionInfo 
+        global bMotionInfo
 
         set lastGreeted [bMotion_plugins_settings_get "complex:hello" "lastGreeted" $channel ""]
@@ -65 +65 @@
 }
 
-bMotion_abstract_register "hello_familiars"
-bMotion_abstract_batchadd "hello_familiars" {
+bMotion_abstract_register "hello_familiars" {
         "%%%colen"
         "%%!"

trunk/plugins/en/complex_invader.tcl

@@ -82 +82 @@
 
 # random zimlike phrases
-bMotion_abstract_register "randomZimness"
-bMotion_abstract_batchadd "randomZimness" {
+bMotion_abstract_register "randomZimness" {
         "yes, my tallest!"
         "how can you have an operation impending doom 2 without me?"
@@ -182 +181 @@
         "people of earth! prepare to meet the mighty foot of my planet"
         "well... yes... i'm an unstoppable death machine"
-        }
-
-bMotion_abstract_batchadd "randomZimness" {
         "i congratulate you in recognising my superiority and choosing me to be your love pig!"
         "your magical love adventure begins now"
@@ -225 +221 @@
 
 # random girlike phrases
-bMotion_abstract_register "randomGirness"
-bMotion_abstract_batchadd "randomGirness" {
+bMotion_abstract_register "randomGirness" {
         "i don't know... weee hoo hoo hoo!"
         "I'm gonna sing the doom song now... dooom doom doom"
@@ -291 +286 @@
 
 # random "duty" responses... inevitable Gir
-bMotion_abstract_register "randomDootie"
-bMotion_abstract_batchadd "randomDootie" {
+bMotion_abstract_register "randomDootie" {
         "dootie %VAR{smiles}"
         "doootie dootie dooootie dootie"
@@ -304 +298 @@
 
 # random zim/gir name change responses
-bMotion_abstract_register "randomZimNameChange"
-bMotion_abstract_batchadd "randomZimNameChange" {
+bMotion_abstract_register "randomZimNameChange" {
         "master, where did you go? I can't see you"
         "master?"
@@ -326 +319 @@
 # nick change response
 bMotion_plugin_add_irc_event "invader(nick)" "nick" ".*" 5 "bMotion_plugin_complex_invader_nick" "en"
-

trunk/plugins/en/complex_joker.tcl

@@ -17 +17 @@
 # random joke callback
 proc bMotion_plugin_complex_invoke_joke { nick host handle channel text } {
-        global bMotion_abstract_contents jokeInfo 
+        global bMotion_abstract_contents jokeInfo
 
         # I'll have no part in this if i'm telling a joke already
@@ -111 +111 @@
         bMotionDoAction $channel $nick "%DELAY{10}%|$answer"
 
-        return 1 
+        return 1
 }
 

trunk/plugins/en/complex_knockknock.tcl

@@ -61 +61 @@
         }
 }
-bMotion_abstract_register "knock1"
-bMotion_abstract_batchadd "knock1" [list "%%: Who's there?" "who's there?"]
+bMotion_abstract_register "knock1" [list "%%: Who's there?" "who's there?"]
 
-bMotion_abstract_register "knock2"
-bMotion_abstract_batchadd "knock2" [list "%% who?"]
+bMotion_abstract_register "knock2" [list "%% who?"]
 
-bMotion_abstract_register "knock3"
-bMotion_abstract_batchadd "knock3" [list "%REPEAT{3:10:ha}" "%REPEAT{3:10:ha}%|I don't get it." "..." "?" "lol" "what" "%VAR{smiles}"]
+bMotion_abstract_register "knock3" [list "%REPEAT{3:10:ha}" "%REPEAT{3:10:ha}%|I don't get it." "..." "?" "lol" "what" "%VAR{smiles}"]
 

trunk/plugins/en/complex_les.tcl

@@ -12 +12 @@
 bMotion_plugin_add_complex "les" "^les .+" 40 bMotion_plugin_complex_les "en"
 
-proc bMotion_plugin_complex_les { nick host handle channel text } {  
+proc bMotion_plugin_complex_les { nick host handle channel text } {
         if {![bMotion_interbot_me_next $channel]} {
                 return 0

trunk/plugins/en/complex_love.tcl

@@ -28 +28 @@
         }
 
-        driftFriendship $nick 8 
+        driftFriendship $nick 8
         # people of the wrong gender get the platonic treatment
         if {![bMotionLike $nick $host]} {

trunk/plugins/en/complex_nazi.tcl

@@ -76 +76 @@
 
 
-bMotion_abstract_register "nazi1"
-bMotion_abstract_batchadd "nazi1" [list "%%: \"you're\"" "their what?" "s/your/you're/"]
+bMotion_abstract_register "nazi1" [list "%%: \"you're\"" "their what?" "s/your/you're/"]
 
-bMotion_abstract_register "nazi2"
-bMotion_abstract_batchadd "nazi2" [list "Invalid regular expression." "You suck at the regular expression syntax." "/detects invalid regexp use" "%%: +/" "s/you/suck/"]
+bMotion_abstract_register "nazi2" [list "Invalid regular expression." "You suck at the regular expression syntax." "/detects invalid regexp use" "%%: +/" "s/you/suck/"]
 
 

trunk/plugins/en/complex_nightmare.tcl

@@ -1145 +1145 @@
 bMotion_abstract_add "goodnights" "I hope you have a dream about %VAR{nicemare} %VAR{smiles}"
 
-bMotion_abstract_add "randomStuff" "/daydreams about %VAR{nicemare} %VAR{smiles}" 
+bMotion_abstract_add "randomStuff" "/daydreams about %VAR{nicemare} %VAR{smiles}"
 bMotion_abstract_add "randomStuff" "aw%REPEAT{2:8:w}... look! It's %VAR{nicemare}%|%VAR{smiles}"
 

trunk/plugins/en/complex_pack.tcl

@@ -28 +28 @@
   return 0
 }
-

trunk/plugins/en/complex_pants.tcl

@@ -32 +32 @@
 }
 
-bMotion_abstract_register "hateitem"
-bMotion_abstract_batchadd "hateitem" {
+bMotion_abstract_register "hateitem" {
   "so, i hate your %% too"
   "yeah me too, %ruser gave them to me and i've never liked them"

trunk/plugins/en/complex_phonetic.tcl

@@ -81 +81 @@
                 } elseif { $letter == " " } {
                         set line "$line "
-                } 
+                }
         }
 
@@ -94 +94 @@
         }
 
-        return $line 
+        return $line
 }
 # end bMotion_plugin_complex_phonetic_xform
@@ -124 +124 @@
 #  bMotion_plugin_output_asshat procedure
 # make the phonetic asshat plugin a general output filter
-proc bMotion_plugin_output_asshat { channel text } { 
+proc bMotion_plugin_output_asshat { channel text } {
         return [ bMotion_plugin_complex_phonetic_xform $text 1 ]
 }
@@ -131 +131 @@
 #  bMotion_plugin_output_phonetic procedure
 # make the phonetic plugin a general output filter
-proc bMotion_plugin_output_phonetic { channel text } { 
+proc bMotion_plugin_output_phonetic { channel text } {
         return [ bMotion_plugin_complex_phonetic_xform $text 0 ]
 }

trunk/plugins/en/complex_pokemon.tcl

@@ -82 +82 @@
         checkPokemon "Damoachu" $channel
         bMotionDoAction $channel $nick "Damoa...chu!"
-        if {$who == ""} { 
+        if {$who == ""} {
           bMotionDoAction $channel $nick "*monkey* *monkey* *monkey* *squirtle*"
         } else {

trunk/plugins/en/complex_questions.tcl

@@ -460 +460 @@
                                         return 1
                                 }
-                                bMotionDoAction $channel "" "%VAR{cracker_your_hats_current}" 
+                                bMotionDoAction $channel "" "%VAR{cracker_your_hats_current}"
                                 return 1
                         }
@@ -478 +478 @@
                                         return 1
                                 }
-                                bMotionDoAction $channel $handle "%VAR{cracker_handle_hats_current}" 
+                                bMotionDoAction $channel $handle "%VAR{cracker_handle_hats_current}"
                                 return 1
 
@@ -586 +586 @@
 ## end sid's functions
 
-bMotion_abstract_register "question_what_fact_wrapper"
-bMotion_abstract_batchadd "question_what_fact_wrapper" {
+bMotion_abstract_register "question_what_fact_wrapper" {
   "%%"
   "%% i guess"
@@ -595 +594 @@
 }
 
-bMotion_abstract_register "question_want_reply_wrapper"
-bMotion_abstract_batchadd "question_want_reply_wrapper" {
+bMotion_abstract_register "question_want_reply_wrapper" {
   "Why? I've got %VAR{sillyThings}!"
   "With %VAR{sillyThings} I have no need for anything else."
@@ -612 +610 @@
 }
 
-bMotion_abstract_register "question_colour_wrapper"
-bMotion_abstract_batchadd "question_colour_wrapper" {
+bMotion_abstract_register "question_colour_wrapper" {
   "%VAR{colours}"
   "hmm.. %VAR{colours}, I think"

trunk/plugins/en/complex_readings.tcl

@@ -2 +2 @@
 #
 # vim: fdm=indent fdn=1
- 
+
 ###############################################################################
 # This is a bMotion plugin
@@ -27 +27 @@
 }
 
-bMotion_abstract_register "readings_scan"
-bMotion_abstract_batchadd "readings_scan" {
+bMotion_abstract_register "readings_scan" {
   "/scans %%"
   "/analyses %%"
@@ -36 +35 @@
 }
 
-bMotion_abstract_register "readings_result"
-bMotion_abstract_batchadd "readings_result" {
+bMotion_abstract_register "readings_result" {
   "%%: That reads as %NUMBER{10000} %VAR{units}."
   "%SETTING{complex:readings:reading:reading:_} levels of %NUMBER{101} percent detected."

trunk/plugins/en/complex_replicate.tcl

@@ -21 +21 @@
 
         #make it so
-        if [regexp -nocase "^it so$" $details] { 
+        if [regexp -nocase "^it so$" $details] {
                 bMotionDoAction $channel $nick "/makes it so for %%"
                 bMotion_plugins_settings_set "system" "lastdonefor" $channel "" $nick

trunk/plugins/en/complex_scrap.tcl

@@ -1 @@
-# 
+#
 #
 # vim: fdm=indent fdn=1
@@ -37 +37 @@
     }
 
-# outputtype = 0 <-- regular output    
-# outputtype = 1 <-- silly output    
-# outputtype = 2 <-- adult output    
-# outputtype = 3 <-- silly adult output    
+# outputtype = 0 <-- regular output
+# outputtype = 1 <-- silly output
+# outputtype = 2 <-- adult output
+# outputtype = 3 <-- silly adult output
 
     # quality
@@ -129 +129 @@
 }
 
-bMotion_abstract_register "scrap_qualities"
-bMotion_abstract_batchadd "scrap_qualities" {
+bMotion_abstract_register "scrap_qualities" {
   "broken"
   "cheap"
@@ -162 +161 @@
 }
 
-bMotion_abstract_register "scrap_adjectives"
-bMotion_abstract_batchadd "scrap_adjectives" {
+bMotion_abstract_register "scrap_adjectives" {
   "broken down"
   "greasy"
@@ -218 +216 @@
 bMotion_abstract_add_filter "scrap_adjectives" "mamoth"
 
-bMotion_abstract_register "scrap_power_adjectives"
-bMotion_abstract_batchadd "scrap_power_adjectives" {
+bMotion_abstract_register "scrap_power_adjectives" {
   "super powered"
   "steam powered"
@@ -244 +241 @@
 }
 
-bMotion_abstract_register "scrap_construction"
-bMotion_abstract_batchadd "scrap_construction" {
+bMotion_abstract_register "scrap_construction" {
   "barge"
   "submarine"
@@ -304 +300 @@
 }
 
-bMotion_abstract_register "scrap_silly_qualities_t"
-bMotion_abstract_batchadd "scrap_silly_qualities_t" {
+bMotion_abstract_register "scrap_silly_qualities_t" {
   "weird"
   "strange"
@@ -318 +313 @@
 }
 
-bMotion_abstract_register "scrap_silly_adjectives_t"
-bMotion_abstract_batchadd "scrap_silly_adjectives_t" {
+bMotion_abstract_register "scrap_silly_adjectives_t" {
   "spotty"
   "funny"
@@ -342 +336 @@
 }
 
-bMotion_abstract_register "scrap_silly_power_adjectives_t"
-bMotion_abstract_batchadd "scrap_silly_power_adjectives_t" {
+bMotion_abstract_register "scrap_silly_power_adjectives_t" {
   "lunar powered"
   "psychicly charged"
@@ -354 +347 @@
 }
 
-bMotion_abstract_register "scrap_silly_construction_t"
-bMotion_abstract_batchadd "scrap_silly_construction_t" {
+bMotion_abstract_register "scrap_silly_construction_t" {
   "blamanche"
   "fork"
@@ -408 +400 @@
 bMotion_abstract_add_filter "scrap_silly_construction_t" "coktail machine"
 
-bMotion_abstract_register "scrap_adult_qualities_t"
-bMotion_abstract_batchadd "scrap_adult_qualities_t" {
+bMotion_abstract_register "scrap_adult_qualities_t" {
   "well formed"
   "well rounded"
   "slinky"
   "slender"
-  "slim"  
+  "slim"
   "voluptuous"
   "bound"
@@ -421 +412 @@
 }
 
-bMotion_abstract_register "scrap_adult_adjectives_t"
-bMotion_abstract_batchadd "scrap_adult_adjectives_t" {
+bMotion_abstract_register "scrap_adult_adjectives_t" {
   "norty"
   "vary norty"
@@ -449 +439 @@
   "shagging"
   "fucking"
-  "screwing"  
+  "screwing"
   "bulging"
   "tight"
@@ -481 +471 @@
 bMotion_abstract_add_filter "scrap_adult_adjectives_t" "girating"
 
-bMotion_abstract_register "scrap_adult_power_adjectives_t"
-bMotion_abstract_batchadd "scrap_adult_power_adjectives_t" {
+bMotion_abstract_register "scrap_adult_power_adjectives_t" {
   "jizz powered"
   "love juice powered"
@@ -491 +480 @@
 }
 
-bMotion_abstract_register "scrap_adult_construction_t"
-bMotion_abstract_batchadd "scrap_adult_construction_t" {
+bMotion_abstract_register "scrap_adult_construction_t" {
   "dildo"
   "love doll"
@@ -513 +501 @@
   "tongue"
   "lip"
-  "mouth" 
+  "mouth"
   "teenager"
   "prostitute"
@@ -520 +508 @@
   "wench"
   "bitch"
-  "mistress" 
+  "mistress"
   "box"
   "dominatrix"
@@ -543 +531 @@
 
 #create the big lists :)
-bMotion_abstract_register "scrap_silly_qualities"
-bMotion_abstract_batchadd "scrap_silly_qualities" {
+bMotion_abstract_register "scrap_silly_qualities" {
   "%VAR{scrap_qualities}"
   "%VAR{scrap_silly_qualities_t}"
 }
-bMotion_abstract_register "scrap_silly_power_adjectives"
-bMotion_abstract_batchadd "scrap_silly_power_adjectives" {
+bMotion_abstract_register "scrap_silly_power_adjectives" {
   "%VAR{scrap_power_adjectives}"
   "%VAR{scrap_silly_power_adjectives_t}"
 }
-bMotion_abstract_register "scrap_silly_adjectives"
-bMotion_abstract_batchadd "scrap_silly_adjectives" {
+bMotion_abstract_register "scrap_silly_adjectives" {
   "%VAR{scrap_adjectives}"
   "%VAR{scrap_silly_adjectives_t}"
 }
-bMotion_abstract_register "scrap_silly_construction"
-bMotion_abstract_batchadd "scrap_silly_construction" {
+bMotion_abstract_register "scrap_silly_construction" {
   "%VAR{scrap_construction}"
   "%VAR{scrap_silly_construction_t}"
 }
 
-bMotion_abstract_register "scrap_adult_qualities"
-bMotion_abstract_batchadd "scrap_adult_qualities" {
+bMotion_abstract_register "scrap_adult_qualities" {
   "%VAR{scrap_qualities}"
   "%VAR{scrap_adult_qualities_t}"
 }
-bMotion_abstract_register "scrap_adult_power_adjectives"
-bMotion_abstract_batchadd "scrap_adult_power_adjectives" {
+bMotion_abstract_register "scrap_adult_power_adjectives" {
   "%VAR{scrap_power_adjectives}"
   "%VAR{scrap_adult_power_adjectives_t}"
 }
-bMotion_abstract_register "scrap_adult_adjectives"
-bMotion_abstract_batchadd "scrap_adult_adjectives" {
+bMotion_abstract_register "scrap_adult_adjectives" {
   "%VAR{scrap_adjectives}"
   "%VAR{scrap_adult_adjectives_t}"
 }
-bMotion_abstract_register "scrap_adult_construction"
-bMotion_abstract_batchadd "scrap_adult_construction" {
+bMotion_abstract_register "scrap_adult_construction" {
   "%VAR{scrap_construction}"
   "%VAR{scrap_adult_construction_t}"
 }
 
-bMotion_abstract_register "scrap_silly_adult_qualities"
-bMotion_abstract_batchadd "scrap_silly_adult_qualities" {
+bMotion_abstract_register "scrap_silly_adult_qualities" {
   "%VAR{scrap_qualities}"
   "%VAR{scrap_silly_qualities_t}"
 }
-bMotion_abstract_register "scrap_silly_adult_power_adjectives"
-bMotion_abstract_batchadd "scrap_silly_adult_power_adjectives" {
+bMotion_abstract_register "scrap_silly_adult_power_adjectives" {
   "%VAR{scrap_power_adjectives}"
   "%VAR{scrap_silly_power_adjectives_t}"
 }
-bMotion_abstract_register "scrap_silly_adult_adjectives"
-bMotion_abstract_batchadd "scrap_silly_adult_adjectives" {
+bMotion_abstract_register "scrap_silly_adult_adjectives" {
   "%VAR{scrap_adjectives}"
   "%VAR{scrap_silly_adjectives_t}"
 }
-bMotion_abstract_register "scrap_silly_adult_construction"
-bMotion_abstract_batchadd "scrap_silly_adult_construction" {
+bMotion_abstract_register "scrap_silly_adult_construction" {
   "%VAR{scrap_construction}"
   "%VAR{scrap_silly_construction_t}"
@@ -607 +583 @@
 
 #duplicate for second adjectives
-bMotion_abstract_register "scrap_silly_adjectives2"
-bMotion_abstract_batchadd "scrap_silly_adjectives2" {
+bMotion_abstract_register "scrap_silly_adjectives2" {
   "%VAR{scrap_silly_adjectives}"
 }
-bMotion_abstract_register "scrap_adult_adjectives2"
-bMotion_abstract_batchadd "scrap_adult_adjectives2" {
+bMotion_abstract_register "scrap_adult_adjectives2" {
   "%VAR{scrap_adult_adjectives}"
 }
-bMotion_abstract_register "scrap_silly_adult_adjectives2"
-bMotion_abstract_batchadd "scrap_silly_adult_adjectives2" {
+bMotion_abstract_register "scrap_silly_adult_adjectives2" {
   "%VAR{scrap_silly_adult_adjectives}"
 }
-bMotion_abstract_register "scrap_adjectives2"
-bMotion_abstract_batchadd "scrap_adjectives2" {
+bMotion_abstract_register "scrap_adjectives2" {
   "%VAR{scrap_adjectives}"
 }

trunk/plugins/en/complex_sex.tcl

@@ -17 +17 @@
 proc bMotion_plugin_complex_sex_go_down_on { nick host handle channel text } {
   global botnicks
-  if [regexp -nocase "${botnicks}:?,? (please)?go down on (.+)" $text ming ming1 ming2 details] {    
-    bMotionGoDownOn $channel $details $nick    
+  if [regexp -nocase "${botnicks}:?,? (please)?go down on (.+)" $text ming ming1 ming2 details] {
+    bMotionGoDownOn $channel $details $nick
     return 1
   }
@@ -34 +34 @@
 
 proc bMotionGoDownOn {channel nick forNick} {
-    global mood botnick 
+    global mood botnick
     regsub {^([^ ]+)( .+)?} $nick {\1} nick
     bMotion_putloglev d * "bMotion: Was asked to go down on '$nick' in $channel by $forNick"
-    if {[regexp -nocase "(himself|herself|your?self)" $nick] || [isbotnick $nick]} { 
+    if {[regexp -nocase "(himself|herself|your?self)" $nick] || [isbotnick $nick]} {
       bMotionDoAction $channel "" "No. (ERR_EXCESS_RIBS)"
       return 0

trunk/plugins/en/complex_snap.tcl

@@ -20 +20 @@
 
     set ctime [clock seconds]
-    
+
     if {
         ($text == [bMotion_plugins_settings_get "complex:snap" $channel "" "text"]) &&

trunk/plugins/en/complex_sosyour.tcl

@@ -33 +33 @@
 }
 
-bMotion_abstract_register "sosyours"
-bMotion_abstract_batchadd "sosyours" [list "so's your face" "you're %2"]
+bMotion_abstract_register "sosyours" [list "so's your face" "you're %2"]
 

trunk/plugins/en/complex_spoonerism.tcl

@@ -95 +95 @@
 
 
-bMotion_abstract_register "spoonerisms"
-bMotion_abstract_batchadd "spoonerisms" [list "%% ... more like %2, am i rite?" "%% ... more like %2, am i right?" "%%? More like %2, am I correct?" "/. o O (%2)"]
+bMotion_abstract_register "spoonerisms" [list "%% ... more like %2, am i rite?" "%% ... more like %2, am i right?" "%%? More like %2, am I correct?" "/. o O (%2)"]
 
 bMotion_abstract_register "xhery_male" [list "I'd %% her %2"]

trunk/plugins/en/complex_sport.tcl

@@ -25 +25 @@
 }
 
-bMotion_abstract_register "sport_superadjectives"
-bMotion_abstract_batchadd "sport_superadjectives" {
+bMotion_abstract_register "sport_superadjectives" {
   "extreme"
   "super"
@@ -65 +64 @@
 }
 
-bMotion_abstract_register "sport_adjectives"
-bMotion_abstract_batchadd "sport_adjectives" {
+bMotion_abstract_register "sport_adjectives" {
   "downhill"
   "uphill"
@@ -102 +100 @@
 }
 
-bMotion_abstract_register "sport_sports"
-bMotion_abstract_batchadd "sport_sports" {
+bMotion_abstract_register "sport_sports" {
         "archery"
         "athletics"
@@ -191 +188 @@
 }
 
-bMotion_abstract_register "sport_adult_superadjectives_t"
-bMotion_abstract_batchadd "sport_adult_superadjectives_t" {
+bMotion_abstract_register "sport_adult_superadjectives_t" {
   "nude"
   "horny"
@@ -201 +197 @@
 }
 
-bMotion_abstract_register "sport_adult_adjectives_t"
-bMotion_abstract_batchadd "sport_adult_adjectives_t" {
+bMotion_abstract_register "sport_adult_adjectives_t" {
   "bent"
   "%ruser"
@@ -219 +214 @@
 }
 
-bMotion_abstract_register "sport_adult_sports_t"
-bMotion_abstract_batchadd "sport_adult_sports_t" {
+bMotion_abstract_register "sport_adult_sports_t" {
   "chicken fancying"
         "vomiting"
@@ -236 +230 @@
 
 #create the big lists :)
-bMotion_abstract_register "sport_adult_superadjectives"
-bMotion_abstract_batchadd "sport_adult_superadjectives" {
+bMotion_abstract_register "sport_adult_superadjectives" {
   "%VAR{sport_adjectives}"
   "%VAR{sport_adult_superadjectives_t}"
         "%VAR{scrap_adult_adjectives_t}"
 }
-bMotion_abstract_register "sport_adult_adjectives"
-bMotion_abstract_batchadd "sport_adult_adjectives" {
+bMotion_abstract_register "sport_adult_adjectives" {
   "%VAR{sport_adjectives}"
   "%VAR{sport_adult_adjectives_t}"
         "%VAR{scrap_adult_construction_t}"
 }
-bMotion_abstract_register "sport_adult_sports"
-bMotion_abstract_batchadd "sport_adult_sports" {
+bMotion_abstract_register "sport_adult_sports" {
   "%VAR{sport_sports}"
   "%VAR{sport_adult_sports_t}"

trunk/plugins/en/complex_summon.tcl

@@ -63 +63 @@
                                 set msg [bMotionDoInterpolation "%VAR{summon_privmsg_response}" $nick ""]
                                 # replacements (TODO: may not be needed after doInterpolation)
-                                regsub "%channel" $msg $channel msg 
+                                regsub "%channel" $msg $channel msg
                                 regsub "%%" $msg $nick msg
                                 # notify
@@ -70 +70 @@
                         return 1
                 }
-        } 
+        }
         bMotion_putloglev d * "bMotion: (summon) $nick doesn't know what they're doing"
         # poke fun at the idiot
         bMotionDoAction $channel $nick "%VAR{summon_channel_idiot}"
-        return 1 
+        return 1
 }
 
@@ -80 +80 @@
 bMotion_plugin_add_complex "summon" "^!summon" 100 "bMotion_plugin_complex_summon" "en"
 
-bMotion_abstract_register "summon_channel_response_notthere"
-bMotion_abstract_batchadd "summon_channel_response_notthere" {
+bMotion_abstract_register "summon_channel_response_notthere" {
         "yoooo hooooo! %%!"
         "hello there, %%?"
@@ -91 +90 @@
 }
 
-bMotion_abstract_register "summon_channel_response"
-bMotion_abstract_batchadd "summon_channel_response" {
+bMotion_abstract_register "summon_channel_response" {
         "/prods at %% with %VAR{sillyThings}"
         "through my awesome powers of telepathy, I shall summon %%!!"
@@ -103 +101 @@
 bMotion_abstract_add_filter "summon_channel_response" "%noun"
 
-bMotion_abstract_register "summon_privmsg_response"
-bMotion_abstract_batchadd "summon_privmsg_response" {
+bMotion_abstract_register "summon_privmsg_response" {
         "FYI: %% was looking for you on %channel"
         "just so you know %% was asking about you on %channel"
@@ -114 +111 @@
 bMotion_abstract_add_filter "summon_privmsg_response" "%chan(?!nel)"
 
-bMotion_abstract_register "summon_channel_idiot"
-bMotion_abstract_batchadd "summon_channel_idiot" {
+bMotion_abstract_register "summon_channel_idiot" {
         "ANNOUNCEMENT: %% is an idiot. That is all."
         "Pay no attention to %%, the village idiot."
@@ -127 +123 @@
 }
 
-bMotion_abstract_register "summon_bot"
-bMotion_abstract_batchadd "summon_bot" {
+bMotion_abstract_register "summon_bot" {
         "oh! here i am!"
         "sup"

trunk/plugins/en/complex_supermarkets.tcl

@@ -14 +14 @@
 
 proc bMotion_plugin_complex_supermarket { nick host handle channel text } {
-  if {![bMotion_interbot_me_next $channel]} { 
-                return 1 
+  if {![bMotion_interbot_me_next $channel]} {
+                return 1
         }
 

trunk/plugins/en/complex_taunt.tcl

@@ -49 +49 @@
 
 ### and our abstracts...
-bMotion_abstract_register "randomTauntPrefixes"
-bMotion_abstract_batchadd "randomTauntPrefixes" {
+bMotion_abstract_register "randomTauntPrefixes" {
   "idiot"
   "stupid"
@@ -76 +75 @@
 }
 
-bMotion_abstract_register "randomTauntSuffixes"
-bMotion_abstract_batchadd "randomTauntSuffixes" {
+bMotion_abstract_register "randomTauntSuffixes" {
   "fool"
   "idiot"

trunk/plugins/en/complex_techsupport.tcl

@@ -24 +24 @@
 # abstracts
 
-bMotion_abstract_register "tech_software"
-bMotion_abstract_batchadd "tech_software" {
+bMotion_abstract_register "tech_software" {
   "windows"
   "xml spy"
@@ -38 +37 @@
 }
 
-bMotion_abstract_register "tech_answer"
-bMotion_abstract_batchadd "tech_answer" {
+bMotion_abstract_register "tech_answer" {
   "I just bought %VAR{tech_software} and I can't get it to %VAR{tech_problem}, I've tried %VAR{tech_tries} and it still won't work"
   "I've just got %VAR{tech_software}, and it won't %VAR{tech_problem}. I've tried everything including %VAR{tech_tries} but nothing helps"
@@ -46 +44 @@
 }
 
-bMotion_abstract_register "tech_problem"
-bMotion_abstract_batchadd "tech_problem" {
+bMotion_abstract_register "tech_problem" {
   "install"
   "work"
@@ -59 +56 @@
 }
 
-bMotion_abstract_register "tech_tries"
-bMotion_abstract_batchadd "tech_tries" {
+bMotion_abstract_register "tech_tries" {
   "sacrificing my boss"
   "reinstalling it"
@@ -72 +68 @@
 }
 
-bMotion_abstract_register "tech_functions"
-bMotion_abstract_batchadd "tech_functions" {
+bMotion_abstract_register "tech_functions" {
   "virus-scan"
   "validate"

trunk/plugins/en/complex_trivia.tcl

@@ -268 +268 @@
 }
 
-bMotion_abstract_register "bahs"
-bMotion_abstract_batchadd "bahs" [list "dang" "blast" "i was close %VAR{unsmiles}" "%colen" "curse you %%" "blah" "bleh" "damnit" "S%REPEAT{1:4:O} CLOSE" "no fair, %ruser told me the wrong answer %VAR{unsmiles}"]
-
-bMotion_abstract_register "trivia_wins"
-bMotion_abstract_batchadd "trivia_wins" [list "%VAR{harhars}" "own3d" "PWND!" "yes!" "w%REPEAT{3:6:o}!" "go %me, go %me!" "whe%REPEAT{3:7:e}" "muhar" "winnar!" "in your face, %ruser!"]
-
-bMotion_abstract_register "trivia_loses"
-bMotion_abstract_batchadd "trivia_loses" [list "hey stop copying me %VAR{unsmiles}" "i was going to say that next" "hay you're cheating %VAR{unsmiles}" "you're in league with the bot, i know it" "that's not the right answer; the right answer is obviously '%VAR{sillyThings}'" "feh" "*cough*google*cough*" "toss" "%VAR{unsmiles}" "I was distracted by %VAR{sillyThings}" "i wish i knew as much as you. really." "/dumb" "/stupid" "i knew that"]
-
-
+bMotion_abstract_register "bahs" [list "dang" "blast" "i was close %VAR{unsmiles}" "%colen" "curse you %%" "blah" "bleh" "damnit" "S%REPEAT{1:4:O} CLOSE" "no fair, %ruser told me the wrong answer %VAR{unsmiles}"]
+
+bMotion_abstract_register "trivia_wins" [list "%VAR{harhars}" "own3d" "PWND!" "yes!" "w%REPEAT{3:6:o}!" "go %me, go %me!" "whe%REPEAT{3:7:e}" "muhar" "winnar!" "in your face, %ruser!"]
+
+bMotion_abstract_register "trivia_loses" [list "hey stop copying me %VAR{unsmiles}" "i was going to say that next" "hay you're cheating %VAR{unsmiles}" "you're in league with the bot, i know it" "that's not the right answer; the right answer is obviously '%VAR{sillyThings}'" "feh" "*cough*google*cough*" "toss" "%VAR{unsmiles}" "I was distracted by %VAR{sillyThings}" "i wish i knew as much as you. really." "/dumb" "/stupid" "i knew that"]

trunk/plugins/en/complex_unf.tcl

@@ -13 +13 @@
 
 bMotion_plugin_add_complex "unf" "((~(rarr|oof|unf)~)|unf|lick(s)?) %botnicks" 100 bMotion_plugin_complex_unf "en"
-  
+
 proc bMotion_plugin_complex_unf { nick host handle channel text } {
   set bodyPaintNick [bMotion_plugins_settings_get "complexaction:hands" "paint_nick" "" ""]
   set bodyPaintChannel [bMotion_plugins_settings_get "complexaction:hands" "paint_channel" "" ""]
-  
+
   if {$bodyPaintNick != "" && $bodyPaintChannel == $channel && $nick == $bodyPaintNick} {
     bMotionDoAction $channel $bodyPaintNick "OOoooooooooooo thanks %%, thats some good tongue action"
-    bMotion_plugins_settings_set "complexaction:hands" "paint_nick" "" "" "" 
-    bMotion_plugins_settings_set "complexaction:hands" "paint_channel" "" "" "" 
+    bMotion_plugins_settings_set "complexaction:hands" "paint_nick" "" "" ""
+    bMotion_plugins_settings_set "complexaction:hands" "paint_channel" "" "" ""
   }
   bMotionGetHorny

trunk/plugins/en/complex_want_catch.tcl

@@ -38 +38 @@
         global botnicks
   if [regexp -nocase {^mm+[,.]* (.+)} $text matches item] {
-    
+
                 if {![bMotion_filter_sillyThings $item]} {
                         return 0
@@ -47 +47 @@
         return 1
     }
-    
+
     bMotion_abstract_add "sillyThings" $item
         
@@ -61 +61 @@
         global botnicks
   if [regexp -nocase {^(.+)\+{2}$} $text matches item] {
-    
+
                 if {![bMotion_filter_sillyThings $item]} {
                         return 0
@@ -71 +71 @@
         return 1
     }
-    
+
     bMotion_abstract_add "sillyThings" $item
         
@@ -134 +134 @@
 }
 
-bMotion_abstract_register "gotone"
-bMotion_abstract_batchadd "gotone" [list "I've already got one%|%BOT\[are you sure?\]%|yes yes, it's very nice" "I already have one of those." "I had one of them the other week. They're very nice, aren't they?" "r"]
+bMotion_abstract_register "gotone" [list "I've already got one%|%BOT\[are you sure?\]%|yes yes, it's very nice" "I already have one of those." "I had one of them the other week. They're very nice, aren't they?" "r"]
 
-bMotion_abstract_register "betters"
-bMotion_abstract_batchadd "betters" [list "mm%REPEAT{1:5:m}, %VAR{sillyThings:strip}" "%VAR{sillyThings:strip} > %%" "%% < %VAR{sillyThings:strip}" "%%++"]
+bMotion_abstract_register "betters" [list "mm%REPEAT{1:5:m}, %VAR{sillyThings:strip}" "%VAR{sillyThings:strip} > %%" "%% < %VAR{sillyThings:strip}" "%%++"]

trunk/plugins/en/complex_wins.tcl

@@ -22 +22 @@
 }
 
-bMotion_abstract_register "wins"
-bMotion_abstract_batchadd "wins" {
+bMotion_abstract_register "wins" {
   "victory for %me%colen"
   "this victory strengthens the soul of %me!"

trunk/plugins/en/complex_woot.tcl

@@ -21 +21 @@
 }
 
-bMotion_abstract_register "woots"
-bMotion_abstract_batchadd "woots" {
+bMotion_abstract_register "woots" {
   "i like %%"
   "\\o/"

trunk/plugins/en/complex_worried.tcl

@@ -24 +24 @@
 }
 
-bMotion_abstract_register "dontworrys"
-bMotion_abstract_batchadd "dontworrys" {
+bMotion_abstract_register "dontworrys" {
   "Don't you worry about %%. I'll worry about blank."
 }

trunk/plugins/en/complex_wrong_console.tcl

@@ -16 +16 @@
 # bMotion_plugin_complex_wrong_console
 proc bMotion_plugin_complex_wrong_console { nick host handle channel text } {
-        if {![bMotion_interbot_me_next $channel]} { 
+        if {![bMotion_interbot_me_next $channel]} {
                 return 0
         }
@@ -26 +26 @@
 
 # random wrong console responses
-bMotion_abstract_register "randomWrongConsoleReply"
-bMotion_abstract_batchadd "randomWrongConsoleReply" {
+bMotion_abstract_register "randomWrongConsoleReply" {
         "yay! %% can't get it right"
         "why don't you tell us your password as well?"

trunk/plugins/en/irc_join.tcl

@@ -11 +11 @@
 
 
-proc bMotion_plugins_irc_default_join { nick host handle channel text } { 
+proc bMotion_plugins_irc_default_join { nick host handle channel text } {
         bMotion_putloglev 4 * "bMotion_plugins_irc_default_join $nick $host $handle $channel $text"
 
@@ -112 +112 @@
 bMotion_plugin_add_irc_event "default join" "join" ".*" 40 "bMotion_plugins_irc_default_join" "en"
 
-bMotion_abstract_register "insult_joins"
-bMotion_abstract_batchadd "insult_joins" [list "%ruser: yeah, %% does suckOH HI %%!" "\[%%\] I'm a %VAR{PROM}%|%VAR{wrong_infoline}" "\[%%\] I love %ruser%|%VAR{wrong_infoline}" "/looks at %%%|so THAT'S where my oil-skin thong got to!" ]
+bMotion_abstract_register "insult_joins" [list "%ruser: yeah, %% does suckOH HI %%!" "\[%%\] I'm a %VAR{PROM}%|%VAR{wrong_infoline}" "\[%%\] I love %ruser%|%VAR{wrong_infoline}" "/looks at %%%|so THAT'S where my oil-skin thong got to!" ]
 
-bMotion_abstract_register "wrong_infoline"
-bMotion_abstract_batchadd "wrong_infoline" [list "oops, wrong infoline, sorry" "huk, wrong infoline" "whoops" "o wait not that infoline"]
+bMotion_abstract_register "wrong_infoline" [list "oops, wrong infoline, sorry" "huk, wrong infoline" "whoops" "o wait not that infoline"]
 
-bMotion_abstract_register "dislike_joins"
-bMotion_abstract_batchadd "dislike_joins" [list "shut up" "o no it's %%" "oh no it's %%" "oh noes it's %% %VAR{unsmiles}" "meh" "oh, it's %ruser.%|\"yay\"" "oh, it's fuckmaster mc shitty white clownhorse ass jacket pubic face." "you look beautiful%|incidentally my favourite artist is picasso"]
+bMotion_abstract_register "dislike_joins" [list "shut up" "o no it's %%" "oh no it's %%" "oh noes it's %% %VAR{unsmiles}" "meh" "oh, it's %ruser.%|\"yay\"" "oh, it's fuckmaster mc shitty white clownhorse ass jacket pubic face." "you look beautiful%|incidentally my favourite artist is picasso"]

trunk/plugins/en/irc_nick_away.tcl

@@ -58 +58 @@
   bMotion_plugins_settings_set "complex:returned" "lastnick" $channel "" $newnick
 
-  if {[regexp -nocase "(away|sleep|gone|afk|zzz+|bed|slaap|w(0|e|3|o)rk|school)" $nick] && 
+  if {[regexp -nocase "(away|sleep|gone|afk|zzz+|bed|slaap|w(0|e|3|o)rk|school)" $nick] &&
        ![regexp -nocase "(away|sleep|gone|afk|slaap|w(0|e|3|o)rk|school)" $newnick]} {
-    
+
     bMotion_plugins_settings_set "system" "lastdonefor" $channel "" $nick
     bMotion_plugins_settings_set "system:join" "lastgreeted" $channel "" $newnick

trunk/plugins/en/irc_quit.tcl

@@ -11 +11 @@
 
 
-proc bMotion_plugins_irc_default_quit { nick host handle channel text } { 
+proc bMotion_plugins_irc_default_quit { nick host handle channel text } {
 
         #has something happened since we last spoke?
@@ -72 +72 @@
 bMotion_plugin_add_irc_event "default part" "part" ".*" 15 "bMotion_plugins_irc_default_quit" "en"
 
-bMotion_abstract_register "departs-nice"
-bMotion_abstract_batchadd "departs-nice" [list "bye %%" "i like them %VAR{smiles}" "i wish they didn't have to go %VAR{unsmiles}" "mmm %%"]
+bMotion_abstract_register "departs-nice" [list "bye %%" "i like them %VAR{smiles}" "i wish they didn't have to go %VAR{unsmiles}" "mmm %%"]
 
-bMotion_abstract_register "departs-nasty"
-bMotion_abstract_batchadd "departs-nasty" [list "bye sucker" "i don't like them" "i hope they don't come back" "%%: AND DON'T COME BACK!" "See You Next Tuesday, %%!" "%%: don't let the door hit your ass on the way out%|because I don't want ass-prints on my new door!" "what a %VAR{insults} %VAR{unsmiles}"]
+bMotion_abstract_register "departs-nasty" [list "bye sucker" "i don't like them" "i hope they don't come back" "%%: AND DON'T COME BACK!" "See You Next Tuesday, %%!" "%%: don't let the door hit your ass on the way out%|because I don't want ass-prints on my new door!" "what a %VAR{insults} %VAR{unsmiles}"]

trunk/plugins/en/output_NUMBER.tcl

@@ -1 +1 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_SETTING.tcl

@@ -1 +1 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_SMILEY.tcl

@@ -1 +1 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_TIME.tcl

@@ -1 +1 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_VAR.tcl

@@ -1 +1 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin
@@ -77 +77 @@
                                 set var [subst $$abstract]
                                 set replacement [pickRandom $var]
-                        }] { 
+                        }] {
                                 bMotion_putloglev d * "Unable to handle %VAR{$abstract}"
                                 return ""
@@ -102 +102 @@
                                                         set prefix [pickRandom $prefixes]
                                                         set replacement "$prefix$replacement"
-                                                } 
+                                                }
                                                 1 {
                                                         regsub "((an?|the|some|his|her|their) )?" $replacement "\\1%VAR{noun_prefix} " replacement

trunk/plugins/en/output_censor.tcl

@@ -12 +12 @@
 ###############################################################################
 
-bMotion_plugin_add_output "censor" bMotion_plugin_output_censor 0 "en" 90 
+bMotion_plugin_add_output "censor" bMotion_plugin_output_censor 0 "en" 90
 
 proc bMotion_plugin_output_censor { channel line } {

trunk/plugins/en/output_channel.tcl

@@ -3 +3 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_demon.tcl

@@ -3 +3 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_ebonics.tcl

@@ -24 +24 @@
                 if [regexp -nocase {^([aeiou]?[^aeiou]+[aeiou])\w{2,}$} $word matches first] {
                         set word "${first}zzle"
-                } 
+                }
 
                 set word [string map -nocase {for fo} $word]

trunk/plugins/en/output_english.tcl

@@ -25 +25 @@
   # me ___s --> /me
   # me __[^s] --> I
-  
+
   if [regexp -nocase {^me ([^ ]+) (.+)} $line matches first rest] {
     bMotion_putloglev 2 * "bMotion: output:english detected a me* line"

trunk/plugins/en/output_homophone.tcl

@@ -31 +31 @@
   foreach word $words {
     if {[bMotion_plugin_output_homophone_chance $homophone_rate]} {
-    
+
       bMotion_putloglev 1 * "trying to trigger homophone on $word"
-      
+
       # we might want to replace this word. iterate through all homophone sets.
-      
+
       foreach homSet $homList {
         set homItems [split $homSet ":"]
-        
+
         bMotion_putloglev 1 * "working with $homSet"
-        
+
         set haveReplaced 0
-        
+
         foreach item $homItems {
           # only try to keep replacing things if we haven't done so yet, to avoid cyclical replacements
@@ -48 +48 @@
             # is it a word we can replace, possibly with some punctuation around it?
             if {[regexp -nocase "^\[\\\,\\\:\\\;\\\.\\\!\\\?\\\-\\\"\\\'\]*($item)\[\\\,\\\:\\\;\\\.\\\!\\\?\\\-\\\"\\\'\]*$" $word fullWord cleanWord]} {
-            
+
               # found a match! replace with a random word from the list
-            
+
               bMotion_putloglev 1 * "$word matches $item, cleanWord is $cleanWord"
-            
+
               set newWord [pickRandom $homItems]
               while { [string equal -nocase $cleanWord $newWord] } {
                 set newWord [pickRandom $homItems]
               }
-            
+
               set haveReplaced 1
-            
+
               # now just change the word and it will be output below
               regsub -all -nocase "\\\w\+" $word $newWord word
-            
+
               bMotion_putloglev 1 * "leaving with $word"
             }

trunk/plugins/en/output_preprocess.tcl

@@ -3 +3 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_rbot.tcl

@@ -1 +1 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_ruser.tcl

@@ -1 +1 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_stop.tcl

@@ -1 +1 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_switch.tcl

@@ -1 +1 @@
 # vim: fdm=indent fdn=1
 #
- 
+
 ###############################################################################
 # This is a bMotion plugin

trunk/plugins/en/output_typos.tcl

@@ -132 +132 @@
 proc bMotion_plugin_output_typos { channel line } {
         bMotion_putloglev 4 * "bMotion_plugin_output_typos $channel $line"
-  global bMotionSettings 
+  global bMotionSettings
 
   set typochance $bMotionSettings(typos)
@@ -187 +187 @@
 }
 
-bMotion_plugin_add_output "typos" bMotion_plugin_output_typos 1 "all" 99 
+bMotion_plugin_add_output "typos" bMotion_plugin_output_typos 1 "all" 99

trunk/plugins/en/simple_general.tcl

@@ -55 +55 @@
 bMotion_plugin_add_simple "cunt" "^(cunt|twat|bollocks)" 80 [list "cunt" "twat" "bollocks" "bastards" "idiot" "wanker" "%VAR{prom_first}" "pile of %VAR{prom_first}" "%VAR{prom_first}ing %VAR{prom_first}ers"] "en"
 
-
-bMotion_plugin_add_simple "likea-catch" "i do love a good (.+)" 40 [list "me too %VAR{smiles}" "same!" ] "en" 
+bMotion_plugin_add_simple "likea-catch" "i do love a good (.+)" 40 [list "me too %VAR{smiles}" "same!" ] "en"
 bMotion_plugin_add_simple "secretcatch" "(secret|sekrit)" 40 [list "we all know %ruser likes to %VAR{dVerbs} themselves with a %VAR{dNouns} %VAR{smiles}" "it was %ruser!" "%VAR{ididntresponses}" ] "en"
 bMotion_plugin_add_simple "andthan-catch" "and( then| than)" 10 [list "and then a %VAR{animals} came" "and then a bear came" "and then my %VAR{bodypart} %VAR{fellOffs}" "and thaaan?"] "en"

trunk/plugins/en/simple_here.tcl

@@ -15 +15 @@
 # abstracts
 
-bMotion_abstract_register "here_responses"
-bMotion_abstract_batchadd "here_responses" {
+bMotion_abstract_register "here_responses" {
   "%VAR{nos}"
 }

trunk/plugins/en/simple_ick.tcl

@@ -15 +15 @@
 # abstracts
 
-bMotion_abstract_register "ick_sentences"
-bMotion_abstract_batchadd "ick_sentences" {
+bMotion_abstract_register "ick_sentences" {
   "Don't picture %VAR{ick_males} and %VAR{ick_females} in %VAR{ick_wraps} and covered in %VAR{ick_covereds} %VAR{ick_fucks} each other %VAR{ick_locations}"
   "Don't picture %VAR{ick_females} %VAR{ick_fucks} %VAR{ick_males} %VAR{ick_dildos} %VAR{ick_locations}"
@@ -22 +21 @@
 }
 
-bMotion_abstract_register "ick_males"
-bMotion_abstract_batchadd "ick_males" { 
-  "yourself" 
-  "Jean-Luc Picard" 
-  "the Pope" 
-  "John Major" 
-  "your dad" 
-  "the entire crew of Voyager" 
+bMotion_abstract_register "ick_males" {
+  "yourself"
+  "Jean-Luc Picard"
+  "the Pope"
+  "John Major"
+  "your dad"
+  "the entire crew of Voyager"
   "your mum"
   "Bill Gates"
@@ -44 +42 @@
   "Tim"
   "Brian"
-        "%ruser{male}"
+  "%ruser{male}"
 }
 
-bMotion_abstract_register "ick_females"
-bMotion_abstract_batchadd "ick_females" { 
-  "the queen" 
-  "your mum" 
-  "Miss Marple" 
-  "that really minging woman who was on Eurovision" 
+bMotion_abstract_register "ick_females" {
+  "the queen"
+  "your mum"
+  "Miss Marple"
+  "that really minging woman who was on Eurovision"
   "Ling Xiaoyu"
   "Britney Spears"
@@ -60 +57 @@
   "Jade of Big Brother"
   "Davina McCall"
-        "%ruser{female}"
+  "%ruser{female}"
 }
 
-bMotion_abstract_register "ick_wraps"
-bMotion_abstract_batchadd "ick_wraps" { 
-  "cellophane" 
-  "cling-film" 
-  "pvc" 
-  "latex" 
-  "a thong" 
-  "stockings" 
-  "a miniskirt" 
+bMotion_abstract_register "ick_wraps" {
+  "cellophane"
+  "cling-film"
+  "pvc"
+  "latex"
+  "a thong"
+  "stockings"
+  "a miniskirt"
   "zero-gravity"
   "pantyhose"
   "chains"
-        "hotpants"
+  "hotpants"
 }
 
-bMotion_abstract_register "ick_covereds"
-bMotion_abstract_batchadd "ick_covereds" { 
+bMotion_abstract_register "ick_covereds" {
   "custard" "cooking oil" "motor oil" "baby oil" "cream" "whipped cream" "KY" "strawberry jam"
   "Raspberry yogurt *eg*" "chocolate sauce" "coconut oil" "peanut butter" "dairylea" "%ruser{:owner} love juice"
@@ -86 +81 @@
 bMotion_abstract_add_filter "ick_covereds" "%OWNER"
 
-bMotion_abstract_register "ick_locations"
-bMotion_abstract_batchadd "ick_locations" { 
-  "in your bed"   
-  "on a chair" "in a field" "on a checkout" "against a fish tank" 
-  "on a trampoline" "from behind" 
-  "on a train" "on a bus" "in a swimming pool" "at the bus stop" "in your parents' bed" "under that bush" 
-   "under your desk" "at the local Tesco" "over there -->" "in the shower" "behind the bikesheds"
-     "in Essex" "in Wales" "on a hilltop" "at Pontins" "for a porn site"
+bMotion_abstract_register "ick_locations" {
+  "in your bed"
+  "on a chair" "in a field" "on a checkout" "against a fish tank"
+  "on a trampoline" "from behind"
+  "on a train" "on a bus" "in a swimming pool" "at the bus stop" "in your parents' bed" "under that bush"
+  "under your desk" "at the local Tesco" "over there -->" "in the shower" "behind the bikesheds"
+  "in Essex" "in Wales" "on a hilltop" "at Pontins" "for a porn site"
   "in %ruser{:owner} bed"
 }
 
-bMotion_abstract_register "ick_fucks"
-bMotion_abstract_batchadd "ick_fucks" { 
-  "doing it to" 
-  "fucking" 
-  "shagging" 
-  "having sex with" 
-  "having intercourse with" 
+bMotion_abstract_register "ick_fucks" {
+  "doing it to"
+  "fucking"
+  "shagging"
+  "having sex with"
+  "having intercourse with"
   "being intimate with"
   "fscking"
   "fux0ring"
-        "rogering"
-        "making sweet love to"
+  "rogering"
+  "making sweet love to"
 }
 
-bMotion_abstract_register "ick_dildos"
-bMotion_abstract_batchadd "ick_dildos" { 
+bMotion_abstract_register "ick_dildos" {
   "with a strap-on" "with a big dildo" "with a cucumber" "with a banana" "with a chicken"
   "whith a cucumber" "with a keyboard" "with bananna motion lotion" "with a ribbed tickler"

trunk/plugins/en/simple_list.tcl

@@ -17 +17 @@
 
 # abstracts
-bMotion_abstract_register "list1"
-bMotion_abstract_batchadd "list1" {
+bMotion_abstract_register "list1" {
   "No. Try \002/msg NoTopic ftp?? ...\002 instead of saying it in the channel. Sheesh."
 }
 
-bMotion_abstract_register "list2"
-bMotion_abstract_batchadd "list2" {
+bMotion_abstract_register "list2" {
   "Heh, idiot."
   "Fool."

trunk/plugins/en/simple_littlebit.tcl

@@ -13 +13 @@
 bMotion_plugin_add_simple "littlebit" "(what, )?not even a little bit" 40 "%VAR{goonthens}" "en"
 
-bMotion_abstract_register "goonthens"
-bMotion_abstract_batchadd "goonthens" {
+bMotion_abstract_register "goonthens" {
   "sssh sekrit"
   "go on then"

trunk/plugins/en/simple_notbot.tcl

@@ -15 +15 @@
 bMotion_plugin_add_simple "arebot" "((is %botnicks a bot)|(are you a bot,? %botnicks)|(^%botnicks%:? are you a bot))" 60 "%VAR{nos}" "en"
 
-bMotion_abstract_register "notbots"
-bMotion_abstract_batchadd "notbots" {
+bMotion_abstract_register "notbots" {
   "no I'm not"
   "am not %SMILEY{sad}"

trunk/plugins/en/simple_notlong.tcl

@@ -17 +17 @@
 }
 
-bMotion_abstract_register "notlong" 
+bMotion_abstract_register "notlong"

trunk/plugins/en/simple_sneeze.tcl

@@ -15 +15 @@
 
 # abstracts
-bMotion_abstract_register "blessyous"
-bMotion_abstract_batchadd "blessyous" {
+bMotion_abstract_register "blessyous" {
   "gesuntheit"
   "bless you"
@@ -26 +25 @@
   "Rogue bogey!"
   "/ducks"
-  "/hides behind %ruser"   
+  "/hides behind %ruser"
   "Great. Now I'm gonna get a cold %VAR{unsmiles}"
   "Eek. Don't give it to me"