Changeset 1094

Timestamp:

12/01/10 17:33:24 (18 months ago)

Author:

james

Message:

Many and varied updates!

Location:

trunk

Files:

• modules/abstracts/en/abstracts.tcl (modified) (2 diffs)
• modules/abstracts/en/randomstuff.tcl (modified) (4 diffs)
• plugins/en/complex_card.tcl (modified) (1 diff)
• plugins/en/complex_crap.tcl (modified) (1 diff)
• plugins/en/complex_fry.tcl (modified) (2 diffs)
• plugins/en/complex_scrap.tcl (modified) (4 diffs)
• plugins/en/complex_spoonerism.tcl (modified) (4 diffs)
• plugins/en/output_demon.tcl (modified) (1 diff)

trunk/modules/abstracts/en/abstracts.tcl

@@ -1343 +1343 @@
         "pizza"
         "corn flakes"
+        "chicken"
+        "beef"
+        "venison"
+        "veal"
+        "pork"
+        "mince"
+        "sausages"
 }
 
@@ -4831 +4838 @@
 
 bMotion_abstract_register "foods" {
-        outlog "running append plugin"
         "roast beef"
         "pork"

trunk/modules/abstracts/en/randomstuff.tcl

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

trunk/plugins/en/complex_card.tcl

@@ -13 +13 @@
 ###############################################################################
 
-bMotion_plugin_add_complex "card" "^(!card)|(pick a card)" 100 bMotion_plugin_complex_card "en"
+bMotion_plugin_add_complex "card" "^(!card( (adult))?)|(pick a card)" 100 bMotion_plugin_complex_card "en"
 
 proc bMotion_plugin_complex_card {nick host handle channel text} {
 
         if {[bMotionTalkingToMe $text] || [bMotion_interbot_me_next $channel]} {
+                set modifier ""
+                regexp -nocase "^!card( (adult))?" $text matches 1 modifier
+                if {[string tolower $modifier] == "adult"} {
+                        bMotionDoAction $channel $nick "%%: the %VAR{card_value} of %VAR{scrap_adult_adjectives_t} %VAR{scrap_adult_construction_t:plural}"
+                        return 1
+                }
+
                 bMotionDoAction $channel $nick "%%: the %VAR{card_value} of %VAR{card_suits}"
                 return 1

trunk/plugins/en/complex_crap.tcl

@@ -30 +30 @@
         "/gift wraps a %VAR{random_crap_adj} %VAR{random_crap_type}%|/ships it first class to %ruser{enemy}"
         "/injects a %VAR{random_crap_adj} %VAR{random_crap_type} into a padded envelope and posts it to %ruser{enemy}"
-        "/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!"
+        "/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!"
 }
+bMotion_abstract_add_filter "random_crap_main" "\$ruser"
 
 bMotion_abstract_register "random_crap_adj"

trunk/plugins/en/complex_fry.tcl

@@ -21 +21 @@
         }
 
-        if [regexp -nocase "technically (\[a-z\]+)\\M" $text matches thing] {
-                bMotionDoAction $channel $thing "The best kind of $thing"
+        if [regexp -nocase "technically ((not (a )?)?(\[a-z\]+))\\M" $text matches thing b c d] {
+                putlog "a=$thing, b=$b, c=$c, d=$d"
+                set response "The best kind of $thing"
+                if {$b == "not a "} {
+                        set response "%VAR{technically_worst}"
+                }
+                bMotionDoAction $channel $d $response 
                 return 1
         }
@@ -34 +39 @@
 }
 
+
+bMotion_abstract_register "technically_worst" {
+        "The best kind of non-%%"
+        "The worst kind of %%"
+}

trunk/plugins/en/complex_scrap.tcl

@@ -160 +160 @@
   "legendary"
   "excellent"
+        "ultimate"
+        "as-seen-on-TV"
 }
 
@@ -199 +201 @@
   "stiff"
   "flexible"
+        "brand new"
+        "power assisted"
 
   "dirt driving"
@@ -236 +240 @@
   "chain driven"
   "pressurised"
+        "nuclear"
+        "atomic"
 }
 
@@ -309 +315 @@
   "goblinoid"
   "magical"
+        "spooky"
 }
 

trunk/plugins/en/complex_spoonerism.tcl

@@ -20 +20 @@
 
 proc bMotion_plugin_complex_spoon { nick host handle channel text } {
-
         if (![bMotion_interbot_me_next $channel]) {
                 return 0
@@ -50 +49 @@
 
 proc bMotion_plugin_complex_spoon2 { nick host handle channel text } {
-
         if (![bMotion_interbot_me_next $channel]) {
                 return 0
@@ -66 +64 @@
 
 proc bMotion_plugin_complex_spoon3 { nick host handle channel text } {
-
         if (![bMotion_interbot_me_next $channel]) {
                 return 0
@@ -76 +73 @@
                 }
 
-                if [regexp -nocase {^(one|of|n)$} $two] {
+                if [regexp -nocase {^(and|one|of|n)$} $two] {
                         return 0
                 }

trunk/plugins/en/output_demon.tcl

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