Changeset 1084 for trunk/modules/abstracts/en/abstracts.tcl

Timestamp:

08/28/10 19:46:27 (21 months ago)

Author:

james

Message:

updated stoplist for append plugin
added support for forcing female and male mixing (:malemixin and :femalemixin)
use ultraprefix for some plurals
more fixes in output_english
more stoplist for complex_spoonerism
stoplist for complex_ass
simple_calls plugin
simple_countries plugin
support for how much question types
fixed action_simple loading
a lot of abstract changes

File:

• trunk/modules/abstracts/en/abstracts.tcl (modified) (9 diffs)

trunk/modules/abstracts/en/abstracts.tcl

@@ -392 +392 @@
         "on the desk"
         "in a book"
-        "Devon"
-        "Amsterdam"
+        "in Devon"
+        "in Amsterdam"
         "a cheese shop"
-        "America"
-        "Mars"
+        "in America"
+        "in Mars"
         "the USS Enterprise"
-        "north pole"
+        "at the north pole"
         "in a field"
         "under a book"
         "on top of the telly"
         "in the toilet"
-        "Chippenham"
-        "New York"
-        "%OWNER{%ruser} house"
-        "hidden."
+        "in Chippenham"
+        "in New York"
+        "at %ruser{:owner} house"
         "in the coffee pot"
         "down the local shop"
@@ -414 +413 @@
         "next to %ruser"
         "in bed with Madonna"
-        "%VAR{cities}"
+        "in bed with %ruser{like}"
+        "in %VAR{cities}"
 }
 bMotion_abstract_register "answerWellbeing" {
@@ -451 +451 @@
   "%NUMBER{10}.%NUMBER{10}"
   "zero"
+}
+
+bMotion_abstract_register "answerHowmuch" {
+        "just enough"
+        "too much"
+        "too little"
+        "the right amount"
 }
 
@@ -1009 +1016 @@
 
 bMotion_abstract_register "bodypart_female" {
+        "front lumps"
         "vagina"
         "fanny"
@@ -1318 +1326 @@
 }
 
+bMotion_abstract_add_filter "ranjoins" "%VAR\{food\}"
+
 bMotion_abstract_register "food" {
         "honey"
@@ -1323 +1333 @@
         "marmite"
         "bovril"
-        "chocolatespread"
+        "chocolate spread"
         "nutella"
-        "peanutbutter"
+        "peanut butter"
         "marmalade"
+        "potato croquettes"
+        "bacon"
+        "toasted sandwich"
+        "pizza"
+        "corn flakes"
 }
 
@@ -3127 +3142 @@
         "well blow me down"
         "well i'll be a monkey's uncle"
+        "well shut me up"
         "yikes"
         "cor"
@@ -4831 +4847 @@
         "carrots"
         "turnips"
+        "pizza"
+        "corn flakes"
 }
 
@@ -5718 +5736 @@
 }
 
+bMotion_abstract_register "rooms" {
+        "bathroom"
+        "lounge"
+        "kitchen"
+        "bedroom"
+        "living room"
+        "basement"
+        "cellar"
+        "walk-in wardrobe"
+}
+
+bMotion_abstract_register "musicalinstruments" {
+        "piano"
+        "trombone"
+        "trumpet"
+        "tuba"
+        "xylophone"
+        "harp"
+        "flute"
+        "clarinet"
+        "oboe"
+        "french horn"
+}
+
+bMotion_abstract_register "pluralprefix" {
+        "a bunch of"
+        "a load of"
+        "a lot of"
+        "a metric fucktonne of"
+        "an imperial fuckton of"
+        "a buttload of"
+}
+
 bMotion_abstract_add_filter "_all" "\{strip\}\}"
 bMotion_abstract_add_filter "_all" "\}\{strip\}"