Changeset 1064 for trunk

Timestamp:

01/17/10 09:55:04 (2 years ago)

Author:

james

Message:

take out dumb numbers, add more variety

File:

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

trunk/modules/abstracts/en/abstracts.tcl

@@ -1 +1 @@
 # Responses
 # $Id$
-# vim: foldmethod=indent
+# vim: foldmethod=indent syntax=OFF
+# This file is syntax=OFF for vim because a) it doesn't really need it and b) it makes vim sloooow
 #
 ###############################################################################
@@ -207 +208 @@
         "Tony Blair"
         "Graham Norton"
-        "the editor of The Sun"
+        "the editor of %VAR{newspapers}"
         "Tim"
         "Brian"
         "who do you think?"
+}
+
+bMotion_abstract_register "newspapers" {
+        "The Sun"
+        "The Mirror"
+        "The Daily Telegraph"
+        "the Financial Times"
+        "The Guardian"
+        "The Independent"
+        "The Times"
+        "the Daily Express"
+        "the Daily Mail"
+        "the Daily Star"
+        "The Daily Sport"
+
+        "the Metro"
+
+  "The Wall Street Journal"
+  "USA Today"
+  "The New York Times"
+  "the Los Angeles Times"
+  "The Times Of Earth"
+  "The Washington Post"
+  "the Daily News (New York)"
+  "the New York Post"
+  "the Chicago Tribune"
+  "the Houston Chronicle"
+  "The Philadelphia Inquirer"
+  "Newsday"
+  "The Denver Post"
+  "The Arizona Republic"
+  "Star Tribune (Minneapolis)"
+  "the Chicago Sun-Times"
+  "The Plain Dealer (Cleveland)"
+  "the Detroit Free Press"
+  "The Boston Globe"
+  "The Dallas Morning News"
+  "The Seattle Times"
+  "San Francisco Chronicle"
+  "The Oregonian"
+  "The Star-Ledger (Newark)"
+  "the San Diego Union-Tribune"
+  "the St. Petersburg Times"
 }
 
@@ -240 +284 @@
         "Tony Blair"
         "Graham Norton"
-        "the editor of The Sun"
+        "the editor of %VAR{newspapers}"
         "Tim"
         "Brian"
@@ -259 +303 @@
         "entropy"
         "we tried that, but you were sick and my hat blew off"
+        "it's sexy %VAR{smiles}"
+        "loneliness"
+        "i don't know"
+        "i could tell you, but then i'd have to %VAR{sillyVerbs} you"
+        "no idea"
+        "just because"
+        "a variety of reasons"
+        "because i'm ugly %VAR{unsmiles}"
+        "because it's cool %VAR{smiles}"
+        "for fun"
 }
 
 bMotion_abstract_register "answerWhys_male" {
         "Because it's on the tip of my foreskin."
+}
+
+bMotion_abstract_register "cities" {
+        "Bath"
+        "Birmingham"
+        "Bradford"
+        "Brighton"
+        "Bristol"
+        "Cambridge"
+        "Canterbury"
+        "Carlisle"
+        "Chester"
+        "Chichester"
+        "Coventry"
+        "Derby"
+        "Durham"
+        "Ely"
+        "Exeter"
+        "Gloucester"
+        "Hereford"
+        "Kingston"
+        "Lancaster"
+        "Leeds"
+        "Leicester"
+        "Lichfield"
+        "Lincoln"
+        "Liverpool"
+        "City"
+        "Manchester"
+        "Newcastle"
+        "Norwich"
+        "Nottingham"
+        "Oxford"
+        "Peterborough"
+        "Plymouth"
+        "Portsmouth"
+        "Preston"
+        "Ripon"
+        "Salford"
+        "Salisbury"
+        "Sheffield"
+        "Southampton"
+        "Stoke-on-Trent"
+        "Sunderland"
+        "Truro"
+        "Wakefield"
+        "Wells"
+        "Westminster"
+        "Winchester"
+        "Wolverhampton"
+        "Worcester"
+        "York"
+        "Northern"
+        "Armagh"
+        "Belfast"
+        "Derry"
+        "Lisburn"
+        "Newry"
+        "Scottish"
+        "Aberdeen"
+        "Dundee"
+        "Edinburgh"
+        "Glasgow"
+        "Inverness"
+        "Stirling"
+        "Welsh"
+        "Bangor"
+        "Cardiff"
 }
 
@@ -273 +395 @@
         "Amsterdam"
         "a cheese shop"
-        "Exeter"
         "America"
         "Mars"
@@ -283 +404 @@
         "in the toilet"
         "Chippenham"
-        "London"
         "New York"
         "%OWNER{%ruser} house"
@@ -294 +414 @@
         "next to %ruser"
         "in bed with Madonna"
+        "%VAR{cities}"
 }
 bMotion_abstract_register "answerWellbeing" {
@@ -317 +438 @@
 bMotion_abstract_register "answerHowmanys" {
         "42"
-        "5"
-        "34975"
-        "ninety-five"
-        "minus 6"
-        "6"
-        "342"
-        "pi"
-        "e"
-        "i"
-        "38"
         "0"
         "none"
-        "22"
         "%NUMBER{1000}"
-}
+  "%NUMBER{100}"
+  "minus %NUMBER{1000}"
+  "-%NUMBER{1000}"
+  "-%NUMBER{100}"
+  "%NUMBER{1000000}"
+  "%NUMBER{10}"
+  "-%NUMBER{10}"
+  "minus %NUMBER{10}"
+  "%NUMBER{10}.%NUMBER{10}"
+  "zero"
+}
+
+bMotion_abstract_add_filter "answerHowmanys" "^e$"
+bMotion_abstract_add_filter "answerHowmanys" "^i$"
+bMotion_abstract_add_filter "answerHowmanys" "^pi$"
+bMotion_abstract_add_filter "answerHowmanys" "6"
+bMotion_abstract_add_filter "answerHowmanys" "342"
+bMotion_abstract_add_filter "answerHowmanys" "38"
+bMotion_abstract_add_filter "answerHowmanys" "5"
+bMotion_abstract_add_filter "answerHowmanys" "34975"
+bMotion_abstract_add_filter "answerHowmanys" "ninety-five"
+bMotion_abstract_add_filter "answerHowmanys" "minus 6"
 
 bMotion_abstract_register "answerHows" {