Changeset 1094 for trunk


Ignore:
Timestamp:
12/01/10 17:33:24 (18 months ago)
Author:
james
Message:

Many and varied updates!

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/modules/abstracts/en/abstracts.tcl

    r1088 r1094  
    13431343        "pizza" 
    13441344        "corn flakes" 
     1345        "chicken" 
     1346        "beef" 
     1347        "venison" 
     1348        "veal" 
     1349        "pork" 
     1350        "mince" 
     1351        "sausages" 
    13451352} 
    13461353 
    … …  
    48314838 
    48324839bMotion_abstract_register "foods" { 
    4833         outlog "running append plugin" 
    48344840        "roast beef" 
    48354841        "pork" 

  • trunk/modules/abstracts/en/randomstuff.tcl

    r1088 r1094  
    5252        "Yay! Pooped!" 
    5353        "The secondary gyrodyne relays in the propulsion field matrix have just depolarized!" 
    54         "/shuffles %OWNER{%ruser} %VAR{foods:plural}" 
     54        "/shuffles %ruser{:owner} %VAR{foods:plural}" 
    5555        "/eats %OWNER{%ruser} %VAR{foods}" 
     56        "/eats %ruser{:owner} %VAR{food:plural}" 
    5657        "/. o O ( I AM NO LONGER EATING PORK )%|I just telepathically communicated that I am no longer eating pork.%|%BOT[yeah, i got that]" 
    5758        "A sammich without bread isn't a sammich. It's meat with mustard on your hands!" 
    … …  
    173174        "cheese" 
    174175        "mmm chicken" 
     176        "mmm %VAR{food}" 
    175177        "%REPEAT{3:7:m} %VAR{_bmotion_like}" 
    176178        "e%REPEAT{3:7:w} %VAR{_bmotion_dislike}" 
    … …  
    560562        "I saved the space-time continuum and %NUMBER{8}0% of your rectum!" 
    561563        "That's why I'm the chicken!" 
     564        "That's why I'm the %VAR{food}!" 
    562565        "You know, you really should keep a personal log; why bore others needlessly?"  
    563566        "that's the most sensible thing i've heard all day. now let's go sniff some butt" 
    … …  
    567570        "impossible%|you are already at full cock now" 
    568571        "you jerked the words right out of my mouth!" 
    569         "and later on i shall rub you down with chicken fat and shout at you" 
     572        "and later on i shall rub you down with %VAR{food} fat and shout at you" 
    570573        "You will be a winner today. Pick a fight with a four-year-old." 
    571574        "you've got no piss control!" 

  • trunk/plugins/en/complex_card.tcl

    r1040 r1094  
    1313############################################################################### 
    1414 
    15 bMotion_plugin_add_complex "card" "^(!card)|(pick a card)" 100 bMotion_plugin_complex_card "en" 
     15bMotion_plugin_add_complex "card" "^(!card( (adult))?)|(pick a card)" 100 bMotion_plugin_complex_card "en" 
    1616 
    1717proc bMotion_plugin_complex_card {nick host handle channel text} { 
    1818 
    1919        if {[bMotionTalkingToMe $text] || [bMotion_interbot_me_next $channel]} { 
     20                set modifier "" 
     21                regexp -nocase "^!card( (adult))?" $text matches 1 modifier 
     22                if {[string tolower $modifier] == "adult"} { 
     23                        bMotionDoAction $channel $nick "%%: the %VAR{card_value} of %VAR{scrap_adult_adjectives_t} %VAR{scrap_adult_construction_t:plural}" 
     24                        return 1 
     25                } 
     26 
    2027                bMotionDoAction $channel $nick "%%: the %VAR{card_value} of %VAR{card_suits}" 
    2128                return 1 

  • trunk/plugins/en/complex_crap.tcl

    r1080 r1094  
    3030        "/gift wraps a %VAR{random_crap_adj} %VAR{random_crap_type}%|/ships it first class to %ruser{enemy}" 
    3131        "/injects a %VAR{random_crap_adj} %VAR{random_crap_type} into a padded envelope and posts it to %ruser{enemy}" 
    32         "/does a %VAR{random_crap_adj} %VAR{random_crap_type} in a flan base%|/cooks it%|Here you go, $ruser{enemy}, I made you this flan!" 
     32        "/does a %VAR{random_crap_adj} %VAR{random_crap_type} in a flan base%|/cooks it%|Here you go, %ruser{enemy}, I made you this flan!" 
    3333} 
     34bMotion_abstract_add_filter "random_crap_main" "\$ruser" 
    3435 
    3536bMotion_abstract_register "random_crap_adj" 

  • trunk/plugins/en/complex_fry.tcl

    r1076 r1094  
    2121        } 
    2222 
    23         if [regexp -nocase "technically (\[a-z\]+)\\M" $text matches thing] { 
    24                 bMotionDoAction $channel $thing "The best kind of $thing" 
     23        if [regexp -nocase "technically ((not (a )?)?(\[a-z\]+))\\M" $text matches thing b c d] { 
     24                putlog "a=$thing, b=$b, c=$c, d=$d" 
     25                set response "The best kind of $thing" 
     26                if {$b == "not a "} { 
     27                        set response "%VAR{technically_worst}" 
     28                } 
     29                bMotionDoAction $channel $d $response  
    2530                return 1 
    2631        } 
    … …  
    3439} 
    3540 
     41 
     42bMotion_abstract_register "technically_worst" { 
     43        "The best kind of non-%%" 
     44        "The worst kind of %%" 
     45} 

  • trunk/plugins/en/complex_scrap.tcl

    r936 r1094  
    160160  "legendary" 
    161161  "excellent" 
     162        "ultimate" 
     163        "as-seen-on-TV" 
    162164} 
    163165 
    … …  
    199201  "stiff" 
    200202  "flexible" 
     203        "brand new" 
     204        "power assisted" 
    201205 
    202206  "dirt driving" 
    … …  
    236240  "chain driven" 
    237241  "pressurised" 
     242        "nuclear" 
     243        "atomic" 
    238244} 
    239245 
    … …  
    309315  "goblinoid" 
    310316  "magical" 
     317        "spooky" 
    311318} 
    312319 

  • trunk/plugins/en/complex_spoonerism.tcl

    r1084 r1094  
    2020 
    2121proc bMotion_plugin_complex_spoon { nick host handle channel text } { 
    22  
    2322        if (![bMotion_interbot_me_next $channel]) { 
    2423                return 0 
    … …  
    5049 
    5150proc bMotion_plugin_complex_spoon2 { nick host handle channel text } { 
    52  
    5351        if (![bMotion_interbot_me_next $channel]) { 
    5452                return 0 
    … …  
    6664 
    6765proc bMotion_plugin_complex_spoon3 { nick host handle channel text } { 
    68  
    6966        if (![bMotion_interbot_me_next $channel]) { 
    7067                return 0 
    … …  
    7673                } 
    7774 
    78                 if [regexp -nocase {^(one|of|n)$} $two] { 
     75                if [regexp -nocase {^(and|one|of|n)$} $two] { 
    7976                        return 0 
    8077                } 

  • trunk/plugins/en/output_demon.tcl

    r1090 r1094  
    3737 
    3838                #other special cases to fix 
    39                 set word [string map -nocase { soam some someoan someone } $word] 
     39                set word [string map -nocase { soam some someoan someone oq ok } $word] 
    4040 
    4141                # [@     enid] i can not be represented by mere regexps. 
Note: See TracChangeset for help on using the changeset viewer.