Changeset 1108

Timestamp:

01/15/11 13:37:53 (16 months ago)

Author:

james

Message:

improve stoplist for demon plugin
add bMotion_sufficient_gap method
fix some pluralising
use new bMotion_sufficient_gap method for smiley, spoonerism and supermarket plugins
better trigger for sound questions
assorted new content

Location:

trunk

Files:

• modules/abstracts/en/abstracts.tcl (modified) (3 diffs)
• modules/abstracts/en/randomstuff.tcl (modified) (2 diffs)
• modules/output.tcl (modified) (1 diff)
• modules/system.tcl (modified) (3 diffs)
• plugins/en/complex_card.tcl (modified) (1 diff)
• plugins/en/complex_questions.tcl (modified) (1 diff)
• plugins/en/complex_scrap.tcl (modified) (2 diffs)
• plugins/en/complex_smiley.tcl (modified) (2 diffs)
• plugins/en/complex_spoonerism.tcl (modified) (2 diffs)
• plugins/en/complex_supermarkets.tcl (modified) (1 diff)
• plugins/en/output_demon.tcl (modified) (1 diff)

trunk/modules/abstracts/en/abstracts.tcl

@@ -4685 +4685 @@
         "%channel is recorded in front of a live studio audience"
         "%VAR{captains_logs}"
+        "/scans wardrobe%|I think this is a %VAR{clothes} day."
+        "Today, I will be mostly wearing... my %VAR{clothes} and my %VAR{clothes}"
+        "/puts on %VAR{clothes}%|Important meeting today, got to look my best %VAR{smiles}"
 }
 
@@ -4742 +4745 @@
         "The Secret Assignment"
         "The Heat Thickens"
+        "There Go My %VAR{clothes:plural,strip,camel}!"
 }
 
@@ -4980 +4984 @@
         "shorts"
         "jacket"
+        "scarf"
+        "vest"
+        "coat"
+        "anorak"
+        "jacket"
+        "poncho"
+        "raincoat"
+        "gloves"
+        "boots"
+        "slippers"
+        "sneakers"
+        "sandals"
+        "baseball cap"
+        "beanie"
+        "bobble hat"
+        "straw hat"
+        "cape"
+        "pajamas"
+        "wetsuit"
+        "apron"
+        "sweater"
+        "polo shirt"
+        "jeans"
+        "breeches"
+        "chaps"
+        "cycling shorts"
+        "jean shorts"
+        "fatsuit"
 }
 
 bMotion_abstract_register "clothes_female" {
+        "crop top"
+        "halter top"
+        "bikini"
+        "G-string"
+        "ballgown"
+        "dress"
+        "burqa"
+        "negligee"
+        "cocktail dress"
+        "frock"
+        "bloomers"
+        "little black dress"
+        "petticoat"
+        "wedding dress"
+        "shoulder pads"
         "knickers"
         "tights"
         "stockings"
         "bra"
+        "leg warmers"
+        "leotard"
         "skirt"
         "thong"
+        "hijab"
+        "crop top"
+        "miniskirt"
+        "catsuit"
+        "swimsuit"
+        "skort"
+        "bonnet"
+        "suspenders"
+        "corset"
+        "girdle"
+        "loose socks"
 }
 
 bMotion_abstract_register "clothes_male" {
+        "jockstrap"
+        "boxer shorts"
+        "running shorts"
+        "lederhosen"
+        "codpiece"
+        "boilersuit"
+        "turban"
+        "shirt"
+        "tank top"
+        "fez"
+        "loincloth"
+        "swimming trunks"
+        "top hat"
+        "fedora"
         "Y-fronts"
         "braces"

trunk/modules/abstracts/en/randomstuff.tcl

@@ -6 +6 @@
 ### Used when the channel is not 'active' (default > 300s since last line)
 bMotion_abstract_register "randomStuff" {
+        "my %VAR{bodypart} is itchy, is that normal?"
         "i have a MIGHTY NEED to use the %VAR{rooms}"
         "help! my %VAR{bodypart:plural} are escaping!"
@@ -227 +228 @@
         "Pardon me. Do you have any grey poupon?"
         "PENIS BECOMES ARM"
+        "%VAR{bodypart:caps} BECOMES %VAR{bodypart:caps}"
         "UH OH YES IT IS LAUNDRY NIGHT FOR ME HA HA HA"
         "I'm eating cake mix!"

trunk/modules/output.tcl

@@ -1004 +1004 @@
         bMotion_putloglev 5 * "bMotionMakePlural ($text)"
 
-        if [regexp -nocase "(ss|ts|us|is|x|ch|sh)$" $text] {
+        if [regexp -nocase "(ss|us|is|x|ch|sh)$" $text] {
                 append text "es"
                 return $text
         }
 
-        if [regexp -nocase "s$" $text] {
+
+        if [regexp -nocase {s$} $text] {
                 return $text
         }

trunk/modules/system.tcl

@@ -200 +200 @@
 
         if {($timeNow - $mostRecent) < $gapTime} {
-                bMotion_putloglev 1 * "most recent is busy enough, not going away"
-                return 0
+                set chance [rand 100]
+                if ($chance > [bMotion_setting_get "awaychance"]) {
+                        bMotion_putloglev 1 * "most recent is busy enough, not going away"
+                        return 0
+                }
+                bMotion_putloglev 1 * "most recent is busy enough but going away anyway"
         }
 
@@ -210 +214 @@
         }
 
-        if {[rand 4] == 0} {
+        if {[rand 3] == 0} {
                 putlog "bMotion: All channels are idle, going away"
                 bMotionSetRandomAway
@@ -1243 +1247 @@
 }
 
-
+# generic time-since handler
+# mingap is in seconds
+# other params are as for plugin settings
+# returns 1 if gap since last is > mingap
+# updates last to be now regardless
+# nick is optional for this
+proc bMotion_sufficient_gap { mingap plugin channel {nick ""} } {
+        bMotion_putloglev 5 * "bMotion_sufficient_gap: $mingap $plugin $channel $nick"
+                set lasttime [bMotion_plugins_settings_get $plugin "lasttime" $channel $nick]
+                set diff [expr $mingap + 1]
+                set gap_ok 0
+
+                if {$lasttime != ""} {
+                        set diff [expr [clock seconds] - $lasttime]
+                }
+                bMotion_putloglev 1 * "sufficient_gap: last=$lasttime, now=[clock seconds], gap=$diff"
+                if {$diff > $mingap} {
+                        set gap_ok 1
+                } 
+                bMotion_plugins_settings_set $plugin "lasttime" $channel $nick [clock seconds]
+                bMotion_putloglev 1 * "sufficient_gap: returning $gap_ok for $plugin $channel ($nick) > $mingap"
+                return $gap_ok
+}
 
 bMotion_putloglev d * "bMotion: system module loaded"

trunk/plugins/en/complex_card.tcl

@@ -16 +16 @@
 
 proc bMotion_plugin_complex_card {nick host handle channel text} {
-
         if {[bMotionTalkingToMe $text] || [bMotion_interbot_me_next $channel]} {
                 set modifier ""

trunk/plugins/en/complex_questions.tcl

@@ -34 +34 @@
 
         bMotion_putloglev 3 * "checking question for sound: $text"
-        if {[regexp -nocase "^$botnicks,?:? what sound " $text] || [regexp -nocase "what sound .+${botnicks}\\?$" $text]} {
+        if {[regexp -nocase "^$botnicks,?:? what (noise|sound)s? " $text] || [regexp -nocase "what (noise|sound)s? .+${botnicks}\\?$" $text]} {
                 bMotion_putloglev 3 * "it's a sound question"
                 bMotionDoAction $channel $nick "%VAR{sound_answer}"

trunk/plugins/en/complex_scrap.tcl

@@ -455 +455 @@
   "tight"
   "loose"
-
   "pole dancing"
   "stripping"
+        "arousing"
+        "exciting"
+        "gentle"
+        "ENORMOUS"
+        "creepy"
+        "damp"
+        "hot"
+        "warm"
+        "substantial"
+        "anal"
+        "3D"
+        "HD"
+        "homosexual"
+        "heterosexual"
+        "wanking"
+        "lactating"
+        "vaginal"
+        "racist"
+        "dumping"
+        "mongy"
+        "nude"
+        "barfing"
+
 }
 bMotion_abstract_add_filter "scrap_adult_adjectives_t" "girating"
@@ -503 +525 @@
   "box"
   "dominatrix"
+        "butt plug"
+        "nipple clamp"
+        "gigolo"
+        "jockstrap"
+        "knickers"
+        "pants"
+        "handcuffs"
+        "bone"
+        "dog"
+        "condom"
+        "shit"
+        "anus"
+        "blowjob"
+        "gentials"
+        "dick"
 }
 bMotion_abstract_add_filter "scrap_adult_construction_t" "girator"

trunk/plugins/en/complex_smiley.tcl

@@ -23 +23 @@
   if {![bMotion_interbot_me_next $channel]} { return 0 }
 
-  foreach i {"smiley" "smiley2"} {
-        bMotion_putloglev 2 * "checking $i"
-        
-                if {[bMotion_plugin_history_check $channel "complex" "bMotion_plugin_complex_$i"]} {
-                        bMotion_putloglev 2 * "can't trigger a smiley so soon"
+        if [bMotion_sufficient_gap 120 "complex:smiley" $channel] {
+                if {$mood(happy) < 0} {
                         return 0
                 }
+
+                bMotionDoAction $channel "" "%VAR{smiles}"
+                bMotionGetHappy
+                bMotionGetUnLonely
+                return 1
         }
-
-  if {$mood(happy) < 0} {
-    return 0
-  }
-
-  bMotionDoAction $channel "" "%VAR{smiles}"
-  bMotionGetHappy
-  bMotionGetUnLonely
-  return 1
+        return 0
 }
 
@@ -47 +41 @@
   if {![bMotion_interbot_me_next $channel]} { return 0 }
 
-  if {$mood(happy) < 0} {
-    return 0
-  }
+        if [bMotion_sufficient_gap 120 "complex:smiley" $channel] {
+                if {$mood(happy) < 0} {
+                        return 0
+                }
 
-  bMotionDoAction $channel "" "%VAR{smiles}"
-  bMotionGetHappy
-  bMotionGetUnLonely
-  return 1
+                bMotionDoAction $channel "" "%VAR{smiles}"
+                bMotionGetHappy
+                bMotionGetUnLonely
+                return 1
+        }
+        return 0
 }

trunk/plugins/en/complex_spoonerism.tcl

@@ -53 +53 @@
         }
 
-        if [regexp -nocase {([b-df-hj-np-tv-xz]+)(([aeiou])\3)([b-df-hj-np-tv-xz]+[.!?]?)} $text matches 1 2 3 4] {
-                if {$matches == "cool"} {
-                        return 0
+        if [bMotion_sufficient_gap 300 "complex:spoonerism" $channel] {
+                if [regexp -nocase {([b-df-hj-np-tv-xz]+)(([aeiou])\3)([b-df-hj-np-tv-xz]+[.!?]?)} $text matches 1 2 3 4] {
+                        if {$matches == "cool"} {
+                                return 0
+                        }
+                        bMotionDoAction $channel $text "$1%REPEAT{2:10:$2}$3$4"
+                        return 1
                 }
-                bMotionDoAction $channel $text "$1%REPEAT{2:10:$2}$3$4"
-                return 1
         }
+        return 0
 }
 
@@ -68 +71 @@
         }
 
-        if [regexp -nocase {([a-z]+)less ([a-z]+)\M} $text matches one two] {
-                if [regexp -nocase {^(un|use|b|regard)$} $one] {
-                        return 0
+        if [bMotion_sufficient_gap 300 "complex:spoonerism" $channel] {
+                if [regexp -nocase {([a-z]+)less ([a-z]+)\M} $text matches one two] {
+                        if [regexp -nocase {^(un|use|b|regard)$} $one] {
+                                return 0
+                        }
+
+                        if [regexp -nocase {^(and|one|of|n)$} $two] {
+                                return 0
+                        }
+
+                        if {[string range $two end end] == "s"} {
+                                append one "s"
+                                set two [string range $two 0 end-1]
+                        }
+                        bMotionDoAction $channel "" "${two}less $one"
+                        return 1
                 }
-
-                if [regexp -nocase {^(and|one|of|n)$} $two] {
-                        return 0
-                }
-
-                if {[string range $two end end] == "s"} {
-                        append one "s"
-                        set two [string range $two 0 end-1]
-                }
-                bMotionDoAction $channel "" "${two}less $one"
-                return 1
         }
+        return 0
 }
 

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 
+        }
+
+        set canDo [bMotion_sufficient_gap 900 "complex:supermarket" $channel]
+
+        if {$canDo == 0} {
+                return 0
+        }
+
   if [regexp -nocase {\m(sainsbury\'s|sainsburys|safeway|aldi|asda|walmart|wal-mart|wal mart|somerfield|lidl|co-op|budgens|cws|kiwk-save|kwiksave|kwik save|budgens|iceland|circle k|k-mart|7-11|costcutter|costco|marks and spencers|m&s|marks and sparks|mace-line)\M} $text matches where ] {
     bMotionDoAction $channel $where "%VAR{insultsupermarket}"

trunk/plugins/en/output_demon.tcl

@@ -37 +37 @@
 
                 #other special cases to fix
-                set word [string map -nocase { soam some someoan someone oq ok looas loose } $word]
+                set word [string map -nocase { boaxs boxes soam some someoan someone oq ok } $word]
 
                 # [@     enid] i can not be represented by mere regexps.