Changeset 1010

Timestamp:

06/19/09 16:28:12 (3 years ago)

Author:

james

Message:

how do i committed changes

Location:

trunk

Files:

• modules/abstracts/en/abstracts.tcl (modified) (1 diff)
• modules/abstracts/en/randomstuff.tcl (modified) (2 diffs)
• modules/output.tcl (modified) (1 diff)
• plugins/en/action_complex_failsafe.tcl (modified) (3 diffs)
• plugins/en/output_VAR.tcl (modified) (1 diff)

trunk/modules/abstracts/en/abstracts.tcl

@@ -4689 +4689 @@
 }
 
+bMotion_abstract_register "spams" {
+        "%VAR{spam_girl} %VAR{spam_girl_verb} %VAR{spam_girl_target}"
+}
+
+bMotion_abstract_register "spam_girl" {
+        "%VAR{spam_adjective} %VAR{spam_girls}"
+        "%VAR{spam_girls}"
+}
+
+bMotion_abstract_register "spam_girls" {
+        "girl"
+        "chick"
+        "daughter"
+        "sister"
+        "mother"
+}
+
+bMotion_abstract_register "spam_boy" {
+        "%VAR{spam_adjective} %VAR{spam_boys}"
+        "%VAR{spam_boys}"
+}
+
+bMotion_abstract_register "spam_boys" {
+        "boy"
+        "bloke"
+        "dude"
+        "father"
+}
+
+bMotion_abstract_register "spam_adjective" {
+        "lustful"
+        "hot"
+        "shaved"
+}
+
+bMotion_abstract_register "spam_girl_verb" {
+        "sucks"
+        "licks"
+        "rubs"
+        "whips"
+        "enjoys"
+        "teases"
+}
+
+bMotion_abstract_register "spam_girl_target" {
+        "%VAR{spam_girl:owner} %VAR{spam_girlbits}"
+        "%VAR{spam_boy:owner} %VAR{spam_boybits}"
+}
+
+bMotion_abstract_register "spam_girlbits" {
+        "vagina"
+        "boobs"
+        "armpit"
+        "neck"
+}
+
+
+bMotion_abstract_register "spam_boybits" {
+        "dick"
+        "cock"
+        "knob"
+        "penis"
+        "armpit"
+        "neck"
+}
+
+bMotion_abstract_register "sillyVerbs" {
+        "accept"
+        "add"
+        "admire"
+        "admit"
+        "advise"
+        "afford"
+        "agree"
+        "alert"
+        "allow"
+        "amuse"
+        "analyse"
+        "announce"
+        "annoy"
+        "answer"
+        "apologise"
+        "appear"
+        "applaud"
+        "appreciate"
+        "approve"
+        "argue"
+        "arrange"
+        "arrest"
+        "arrive"
+        "ask"
+        "attach"
+        "attack"
+        "attempt"
+        "attend"
+        "attract"
+        "avoid"
+        "back"
+        "bake"
+        "balance"
+        "ban"
+        "bang"
+        "bare"
+        "bat"
+        "bathe"
+        "battle"
+        "beam"
+        "beg"
+        "behave"
+        "belong"
+        "bleach"
+        "bless"
+        "blind"
+        "blink"
+        "blot"
+        "blush"
+        "boast"
+        "boil"
+        "bolt"
+        "bomb"
+        "book"
+        "bore"
+        "borrow"
+        "bounce"
+        "bow"
+        "box"
+        "brake"
+        "brake"
+        "branch"
+        "breathe"
+        "bruise"
+        "brush"
+        "bubble"
+        "bump"
+        "burn"
+        "bury"
+        "buzz"
+        "calculate"
+        "call"
+        "camp"
+        "care"
+        "carry"
+        "carve"
+        "cause"
+        "challenge"
+        "change"
+        "charge"
+        "chase"
+        "cheat"
+        "check"
+        "cheer"
+        "chew"
+        "choke"
+        "chop"
+        "claim"
+        "clap"
+        "clean"
+        "clear"
+        "clip"
+        "close"
+        "coach"
+        "coil"
+        "collect"
+        "colour"
+        "comb"
+        "command"
+        "communicate"
+        "compare"
+        "compete"
+        "complain"
+        "complete"
+        "concentrate"
+        "concern"
+        "confess"
+        "confuse"
+        "connect"
+        "consider"
+        "consist"
+        "contain"
+        "continue"
+        "copy"
+        "correct"
+        "cough"
+        "count"
+        "cover"
+        "crack"
+        "crash"
+        "crawl"
+        "cross"
+        "crush"
+        "cry"
+        "cure"
+        "curl"
+        "curve"
+        "cycle"
+        "dam"
+        "damage"
+        "dance"
+        "dare"
+        "decay"
+        "deceive"
+        "decide"
+        "decorate"
+        "delay"
+        "delight"
+        "deliver"
+        "depend"
+        "describe"
+        "desert"
+        "deserve"
+        "destroy"
+        "detect"
+        "develop"
+        "disagree"
+        "disappear"
+        "disapprove"
+        "disarm"
+        "discover"
+        "dislike"
+        "divide"
+        "double"
+        "doubt"
+        "drag"
+        "drain"
+        "dream"
+        "dress"
+        "drip"
+        "drop"
+        "drown"
+        "drum"
+        "dry"
+        "dust"
+        "earn"
+        "educate"
+        "embarrass"
+        "employ"
+        "empty"
+        "encourage"
+        "end"
+        "enjoy"
+        "enter"
+        "entertain"
+        "escape"
+        "examine"
+        "excite"
+        "excuse"
+        "exercise"
+        "exist"
+        "expand"
+        "expect"
+        "explain"
+        "explode"
+        "extend"
+        "face"
+        "fade"
+        "fail"
+        "fancy"
+        "fasten"
+        "fax"
+        "fear"
+        "fence"
+        "fetch"
+        "file"
+        "fill"
+        "film"
+        "fire"
+        "fit"
+        "fix"
+        "flap"
+        "flash"
+        "float"
+        "flood"
+        "flow"
+        "flower"
+        "fold"
+        "follow"
+        "fool"
+        "force"
+        "form"
+        "found"
+        "frame"
+        "frighten"
+        "fry"
+        "gather"
+        "gaze"
+        "glow"
+        "glue"
+        "grab"
+        "grate"
+        "grease"
+        "greet"
+        "grin"
+        "grip"
+        "groan"
+        "guarantee"
+        "guard"
+        "guess"
+        "guide"
+        "hammer"
+        "hand"
+        "handle"
+        "hang"
+        "happen"
+        "harass"
+        "harm"
+        "hate"
+        "haunt"
+        "head"
+        "heal"
+        "heap"
+        "heat"
+        "help"
+        "hook"
+        "hop"
+        "hope"
+        "hover"
+        "hug"
+        "hum"
+        "hunt"
+        "hurry"
+        "identify"
+        "ignore"
+        "imagine"
+        "impress"
+        "improve"
+        "include"
+        "increase"
+        "influence"
+        "inform"
+        "inject"
+        "injure"
+        "instruct"
+        "intend"
+        "interest"
+        "interfere"
+        "interrupt"
+        "introduce"
+        "invent"
+        "invite"
+        "irritate"
+        "itch"
+        "jail"
+        "jam"
+        "jog"
+        "join"
+        "joke"
+        "judge"
+        "juggle"
+        "jump"
+        "kick"
+        "kill"
+        "kiss"
+        "kneel"
+        "knit"
+        "knock"
+        "knot"
+        "label"
+        "land"
+        "last"
+        "laugh"
+        "launch"
+        "learn"
+        "level"
+        "license"
+        "lick"
+        "lie"
+        "lighten"
+        "like"
+        "list"
+        "listen"
+        "live"
+        "load"
+        "lock"
+        "long"
+        "look"
+        "love"
+        "man"
+        "manage"
+        "march"
+        "mark"
+        "marry"
+        "match"
+        "mate"
+        "matter"
+        "measure"
+        "meddle"
+        "melt"
+        "memorise"
+        "mend"
+        "mess up"
+        "milk"
+        "mine"
+        "miss"
+        "mix"
+        "moan"
+        "moor"
+        "mourn"
+        "move"
+        "muddle"
+        "mug"
+        "multiply"
+        "murder"
+        "nail"
+        "name"
+        "need"
+        "nest"
+        "nod"
+        "note"
+        "notice"
+        "number"
+        "obey"
+        "object"
+        "observe"
+        "obtain"
+        "occur"
+        "offend"
+        "offer"
+        "open"
+        "order"
+        "overflow"
+        "owe"
+        "own"
+        "pack"
+        "paddle"
+        "paint"
+        "park"
+        "part"
+        "pass"
+        "paste"
+        "pat"
+        "pause"
+        "peck"
+        "pedal"
+        "peel"
+        "peep"
+        "perform"
+        "permit"
+        "phone"
+        "pick"
+        "pinch"
+        "pine"
+        "place"
+        "plan"
+        "plant"
+        "play"
+        "please"
+        "plug"
+        "point"
+        "poke"
+        "polish"
+        "pop"
+        "possess"
+        "post"
+        "pour"
+        "practise"
+        "pray"
+        "preach"
+        "precede"
+        "prefer"
+        "prepare"
+        "present"
+        "preserve"
+        "press"
+        "pretend"
+        "prevent"
+        "prick"
+        "print"
+        "produce"
+        "program"
+        "promise"
+        "protect"
+        "provide"
+        "pull"
+        "pump"
+        "punch"
+        "puncture"
+        "punish"
+        "push"
+        "question"
+        "queue"
+        "race"
+        "radiate"
+        "rain"
+        "raise"
+        "reach"
+        "realise"
+        "receive"
+        "recognise"
+        "record"
+        "reduce"
+        "reflect"
+        "refuse"
+        "regret"
+        "reign"
+        "reject"
+        "rejoice"
+        "relax"
+        "release"
+        "rely"
+        "remain"
+        "remember"
+        "remind"
+        "remove"
+        "repair"
+        "repeat"
+        "replace"
+        "reply"
+        "report"
+        "reproduce"
+        "request"
+        "rescue"
+        "retire"
+        "return"
+        "rhyme"
+        "rinse"
+        "risk"
+        "rob"
+        "rock"
+        "roll"
+        "rot"
+        "rub"
+        "ruin"
+        "rule"
+        "rush"
+        "sack"
+        "sail"
+        "satisfy"
+        "save"
+        "saw"
+        "scare"
+        "scatter"
+        "scold"
+        "scorch"
+        "scrape"
+        "scratch"
+        "scream"
+        "screw"
+        "scribble"
+        "scrub"
+        "seal"
+        "search"
+        "separate"
+        "serve"
+        "settle"
+        "shade"
+        "share"
+        "shave"
+        "shelter"
+        "shiver"
+        "shock"
+        "shop"
+        "shrug"
+        "sigh"
+        "sign"
+        "signal"
+        "sin"
+        "sip"
+        "ski"
+        "skip"
+        "slap"
+        "slip"
+        "slow"
+        "smash"
+        "smell"
+        "smile"
+        "smoke"
+        "snatch"
+        "sneeze"
+        "sniff"
+        "snore"
+        "snow"
+        "soak"
+        "soothe"
+        "sound"
+        "spare"
+        "spark"
+        "sparkle"
+        "spell"
+        "spill"
+        "spoil"
+        "spot"
+        "spray"
+        "sprout"
+        "squash"
+        "squeak"
+        "squeal"
+        "squeeze"
+        "stain"
+        "stamp"
+        "stare"
+        "start"
+        "stay"
+        "steer"
+        "step"
+        "stir"
+        "stitch"
+        "stop"
+        "store"
+        "strap"
+        "strengthen"
+        "stretch"
+        "strip"
+        "stroke"
+        "stuff"
+        "subtract"
+        "succeed"
+        "suck"
+        "suffer"
+        "suggest"
+        "suit"
+        "supply"
+        "support"
+        "suppose"
+        "surprise"
+        "surround"
+        "suspect"
+        "suspend"
+        "switch"
+        "talk"
+        "tame"
+        "tap"
+        "taste"
+        "tease"
+        "telephone"
+        "tempt"
+        "terrify"
+        "test"
+        "thank"
+        "thaw"
+        "tick"
+        "tickle"
+        "tie"
+        "time"
+        "tip"
+        "tire"
+        "touch"
+        "tour"
+        "tow"
+        "trace"
+        "trade"
+        "train"
+        "transport"
+        "trap"
+        "travel"
+        "treat"
+        "tremble"
+        "trick"
+        "trip"
+        "trot"
+        "trouble"
+        "trust"
+        "try"
+        "tug"
+        "tumble"
+        "turn"
+        "twist"
+        "type"
+        "undress"
+        "unfasten"
+        "unite"
+        "unlock"
+        "unpack"
+        "untidy"
+        "use"
+        "vanish"
+        "visit"
+        "wail"
+        "wait"
+        "walk"
+        "wander"
+        "want"
+        "warm"
+        "warn"
+        "wash"
+        "waste"
+        "watch"
+        "water"
+        "wave"
+        "weigh"
+        "welcome"
+        "whine"
+        "whip"
+        "whirl"
+        "whisper"
+        "whistle"
+        "wink"
+        "wipe"
+        "wish"
+        "wobble"
+        "wonder"
+        "work"
+        "worry"
+        "wrap"
+        "wreck"
+        "wrestle"
+        "wriggle"
+        "x-ray"
+        "yawn"
+        "yell"
+        "zip"
+}
+
 source "$bMotionModules/abstracts/en/randomstuff.tcl"
+

trunk/modules/abstracts/en/randomstuff.tcl

@@ -6 +6 @@
 ### Used when the channel is not 'active' (default > 300s since last line)
 bMotion_abstract_register "randomStuff" {
+        "how do i %VAR{sillyVerbs:past} %VAR{sillyThings:strip}"
+        "n%REPEAT{1:10:o} my %VAR{bodypart}! i'm not supposed to get %VAR{sillyThings:strip,plural} in it!"
         "this one time, at %VAR{sillyThings:strip} camp, i put %VAR{sillyThings}..."
         "/shits %hisher %VAR{clothes}"
@@ -494 +496 @@
 ### Used when the channel is 'active' (default < 300 sec since last line)
 bMotion_abstract_register "activeRandomStuff" {
+        "It was the freshest move I'e ever seen"
         "I don't know but i am tripping on a bun"
         "I saved the space-time continuum and 40% of your rectum!"

trunk/modules/output.tcl

@@ -830 +830 @@
 
 #
+# makes a work past tense... probably best only use it on verbs :P
+proc bMotion_make_past_tense { word } {
+
+        # check if we got passed a multi-part verb (sit on)
+        set extra ""
+        regexp -nocase {^(\w+)( (.+))?} $word matches verb extra
+        set newverb ""
+
+        putlog "working with $verb"
+
+        # handle irregual verbs
+        switch $verb {
+                cut { set newverb $verb }
+                hit { set newverb $verb }
+                fit { set newverb $verb }
+                get { set newverb got }
+                sit { set newverb sat }
+                drink { set newverb drank }
+                catch { set newverb caught }
+                bring { set newverb brought }
+                buy { set newverb bought}
+                teach { set newverb taught }
+                have { set newverb had }
+                do { set newverb did }
+                ride { set newverb rode }
+                go { set newverb went }
+                make { set newverb made }
+        }
+
+        if {$newverb != ""} {
+                return "${newverb}$extra"
+        }
+
+        # verbs ending in e get -ed
+        if [string match -nocase "*e" $verb] {
+                append verb "d"
+                set newverb $verb
+        }
+
+        if {$newverb != ""} {
+                return "${newverb}$extra"
+        }
+
+        # ending in const-y get -ied
+        if [regexp -nocase {(.+[^aeiouy])y$} $verb matches a] {
+                set newverb "${a}ied"
+        }
+
+        if {$newverb != ""} {
+                return "${newverb}$extra"
+        }
+
+        # one vowel + const !wy get double const + ed
+        if [regexp -nocase {(.+[^aeiouy][aeiou])([^aeiouwy])\M} $verb matches a b] {
+                set newverb "${a}${b}${b}ed"
+        }
+
+        if {$newverb != ""} {
+                return "${newverb}$extra"
+        }
+
+        # everything else just gets -ed
+        set newverb "${verb}ed"
+
+        return "${newverb}$extra"
+}
+
+
+#
 # not sure!
 proc chr c {

trunk/plugins/en/action_complex_failsafe.tcl

@@ -15 +15 @@
 bMotion_plugin_add_action_complex "zzz-failsafe" {^(.+?)s?( at|with)? %botnicks} 100 bMotion_plugin_complex_action_failsafe "en"
 bMotion_plugin_add_action_complex "aaa-autogender" {[a-z]+s (his|her) } 100 bMotion_plugin_complex_action_autolearn_gender "en"
+bMotion_plugin_add_action_complex "aaa-verbcatch" {(\w+s)\M} 100 bMotion_plugin_complex_action_verb_catch "en"
 
 proc bMotion_plugin_complex_action_failsafe { nick host handle channel text } {
@@ -108 +109 @@
 }
 
+proc bMotion_plugin_complex_action_verb_catch { nick host handle channel text } {
+
+        set stem ""
+        if [regexp -nocase {^((\w+)s)\M} $text matches verb stem] {
+        }
+
+        if {$stem != ""} {
+                if [string match -nocase "*e" $stem] {
+                        set stem [string range $stem 0 end-1]
+                }
+                # TODO: Handle any obvious cases where the stem isn't just lopping off the s!
+                bMotion_putloglev 1 * "found verb $verb ($stem)"
+                bMotion_abstract_add "sillyVerbs" $stem
+        }
+
+        return 0
+}
+
 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"]
@@ -134 +153 @@
 bMotion_abstract_batchadd "failsafe_niceactions" [list "wh%REPEAT{3:7:e} %VAR{smiles}" "%VAR{smiles}" "/bounces around" "*drool*" ]
 
-
+bMotion_abstract_register "sillyVerbs"

trunk/plugins/en/output_VAR.tcl

@@ -95 +95 @@
                 }
 
+                if {[lsearch $options_list "past"] > -1} {
+                        set replacement [bMotion_make_past_tense $replacement]
+                }
+
                 if {[lsearch $options_list "plural"] > -1} {
                         set replacement [bMotionMakePlural $replacement]