Changeset 1136 for trunk


Ignore:
Timestamp:
01/26/12 16:21:40 (4 months ago)
Author:
james
Message:

new triggers for some verbs
stoplist additions for complex_add and spoonerisms
handle being smacked in a specific bodypart better
content additions all round

Location:
trunk
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

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

    r1135 r1136  
    58995899} 
    59005900 
     5901bMotion_abstract_register "fuckoff" { 
     5902        "%={fuck:cunt:shit:sod} off%! you %VAR{PROM}" 
     5903} 
     5904 
    59015905bMotion_abstract_add_filter "_all" "\{strip\}\}" 
    59025906bMotion_abstract_add_filter "_all" "\}\{strip\}" 

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

    r1133 r1136  
    350350        "%ruser{enemy} in talking shit shocker          " 
    351351        "why just the other day i watched a film with a plot    " 
     352        "why just the other day i watched a film with %VAR{sillyThings}" 
    352353        "ha ha i don't live in norwich anymore, i don't fuck pigs anymore " 
    353354        "i have a battery operated tree \\o/" 

  • trunk/modules/system.tcl

    r1113 r1136  
    12751275        # -rty, -ted? 
    12761276 
    1277         if [regexp -nocase {\m(like|better|bigger|clever|other|rather|the|and|for|to|be|cool|dizzy|different|dry|entire|end|expensive|faster|federal|this|illegitimate|illiteracy|implicit|kind|lack|last|late|later|left|less|little|long|maybe|maybeok|meantime|mathematical|mechanical|more|most|much|multi|new|newer|next|particular|past|pure|quick|same|sheer|short|small|sort|specific|ultra|tubal|total|were|what|whole|weird|wrong)$} $item] { 
     1277        if [regexp -nocase {\m(should|like|better|bigger|clever|other|rather|the|and|for|to|be|cool|dizzy|different|dry|entire|end|expensive|faster|federal|this|illegitimate|illiteracy|implicit|kind|lack|last|late|later|left|less|little|long|maybe|maybeok|meantime|mathematical|mechanical|more|most|much|multi|new|newer|next|particular|past|pure|quick|same|sheer|short|small|sort|specific|ultra|tubal|total|were|what|whole|weird|wrong)$} $item] { 
    12781278                bMotion_putloglev 2 * "sillyThing $item rejected for stoplist" 
    12791279                return 0 

  • trunk/plugins/en/action_complex_failsafe.tcl

    r1011 r1136  
    2626 
    2727        #try to figure out something geneal about this action 
    28         if [regexp -nocase {(hug(gle)?|p[ae]t|rub|like|<3|sniff|smell|nibble|tickle)s?} $verb] { 
     28        if [regexp -nocase {(giggle|hug(gle)?|p[ae]t|rub|like|<3|sniff|smell|nibble|tickle)s?} $verb] { 
    2929                bMotionDoAction $channel $nick "%VAR{failsafe_nice}" $verb 
    3030                bMotionGetHappy 
    … …  
    139139 
    140140bMotion_abstract_register "failsafes_b" 
    141 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 return" "i do love a good %%ing"] 
     141bMotion_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"] 
    142142bMotion_abstract_add_filter "failsafes_b" "%VERB" 
    143143 

  • trunk/plugins/en/action_complex_fucks.tcl

    r936 r1136  
    1212############################################################################### 
    1313 
    14 bMotion_plugin_add_action_complex "fuck" "((s(e|3)x(o|0)r(s|z|5))|(fluffles)|fucks|paalt|shags|paalt|fondles|ravages|rapes|spanks|kisses|zoent|snogs) %botnicks" 100 bMotion_plugin_complex_action_fucks "en" 
     14bMotion_plugin_add_action_complex "fuck" "((s(e|3)x(o|0)r(s|z|5))|(fluffles)|bofs|fucks|paalt|shags|paalt|fondles|ravages|rapes|spanks|kisses|zoent|snogs) %botnicks" 100 bMotion_plugin_complex_action_fucks "en" 
    1515 
    1616proc bMotion_plugin_complex_action_fucks { nick host handle channel text } { 

  • trunk/plugins/en/action_complex_smacks.tcl

    r961 r1136  
    1111############################################################################### 
    1212 
    13 bMotion_plugin_add_action_complex "smacks" "^(kicks|smacks|twats|injures|beats up|punches|hits|thwaps|slaps|pokes|kills|destroys) %botnicks" 100 bMotion_plugin_complex_action_smacks "en" 
     13bMotion_plugin_add_action_complex "smacks" "^(kiqs|kicks|smacks|twats|injures|beats up|punches|hits|thwaps|slaps|pokes|kills|destroys) %botnicks" 100 bMotion_plugin_complex_action_smacks "en" 
    1414 
    1515proc bMotion_plugin_complex_action_smacks { nick host handle channel text } { 
    1616  global botnicks 
    17   if [regexp -nocase "(kicks|smacks|twats|injures|beats up|punches|hits|thwaps|slaps|pokes|kills|destroys) ${botnicks}\\M" $text] { 
     17  if [regexp -nocase "(kicks|smacks|twats|injures|beats up|punches|hits|thwaps|slaps|pokes|kills|destroys) ${botnicks}(('s| in the) (\[a-z \]+))" $text matches 1 2 3 4 where] { 
    1818        if [regexp -nocase "slaps $botnicks around( a bit)? with a( large)? trout" $text] { 
    1919                bMotionDoAction $channel $nick "%VAR{trouts}" 
    … …  
    2323    bMotionGetUnLonely 
    2424    driftFriendship $nick -5 
    25     bMotionDoAction $channel $nick "%VAR{slapped}" 
     25                if {$where != ""} { 
     26                        bMotionDoAction $channel $nick "%VAR{slapped_where}" $where 
     27                        bMotion_abstract_add "bodypart" $where 
     28                } else { 
     29                        bMotionDoAction $channel $nick "%VAR{slapped}" 
     30                } 
    2631    return 1 
    2732  } 
    … …  
    4550        "/%VAR{smacks} %% back with %VAR{sillyThings}" 
    4651        "/%VAR{smacks} %% back with %ruser" 
    47         "ow! my %VAR{bodypart}!" 
    48         "ow! my %VAR{bodypart}! that was my %VAR{counts} one" 
    49         "arrgh my %VAR{bodypart}! now i only have %NUMBER{50} left" 
    50         "arrgh my %VAR{bodypart}! now i only have %NUMBER{50} left%|look, here in this box" 
     52        "%={ow:arrgh}! my %VAR{bodypart}!%! that was my %VAR{counts} one" 
     53        "%={ow:arrgh} my %VAR{bodypart}! now i only have %NUMBER{50} left" 
     54        "%={ow:arrgh} my %VAR{bodypart}! now i only have %NUMBER{50} left%|look, here in this box" 
    5155        "a%REPEAT{3:6:r}gh my %VAR{bodypart}! now i only have %NUMBER{50}%NUMBER{100}%NUMBER{100} left%|look, here in this warehouse" 
    5256        "%VAR{frightens}" 
     57} 
     58 
     59bMotion_abstract_register "slapped_where" { 
     60        "ow%={: hey}! that was my %VAR{counts} %2 %SMILEY{sad}" 
     61        "ow! my %2 %SMILEY{sad}%! that was my %VAR{counts} one" 
     62        "arrgh! my %2! now i only have %NUMBER{50} left%!%|look, here in this box" 
     63        "arrgh! my %2! now I only have %NUMBER{50}%NUMBER{100}%NUMBER{100} left%|look, here in this warehouse" 
    5364} 
    5465 

  • trunk/plugins/en/action_simple_general.tcl

    r1127 r1136  
    1818 
    1919bMotion_plugin_add_action_simple "finger" "pulls %botnicks's? finger" 100 [list "%VAR{sound_short}"] "en" 
     20bMotion_plugin_add_action_simple "rootkit" "rootkits %botnicks" 100 [list "%SMILEY{sad}" "%me#"] "en" 

  • trunk/plugins/en/complex_ass.tcl

    r1084 r1136  
    2121 
    2222        if [regexp -nocase {([a-z]+)[- ]ass ([a-z]+)} $text matches 1 2] { 
    23                 if {![regexp -nocase "so" $2]} { 
    24                         bMotionDoAction $channel "" "$1 ass-$2" 
    25                 } else { 
     23                if {[regexp -nocase "so" $2]} { 
    2624                        return 0 
    2725                } 
     26 
     27                if {[regexp -nocase "^(s)$" $1]} { 
     28                        return 0 
     29                } 
     30 
     31                bMotionDoAction $channel "" "$1 ass-$2" 
    2832        } else { 
    2933                return 0 

  • trunk/plugins/en/complex_spoonerism.tcl

    r1119 r1136  
    7979                        } 
    8080 
    81                         if [regexp -nocase {^(and|one|of|n)$} $two] { 
     81                        if [regexp -nocase {^(doesn|and|one|of|n)$} $two] { 
    8282                                return 0 
    8383                        } 
Note: See TracChangeset for help on using the changeset viewer.