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

Timestamp:

09/11/09 06:26:45 (3 years ago)

Author:

james

Message:

support bothmixin option too

File:

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

trunk/modules/abstracts/en/abstracts.tcl

@@ -1153 +1153 @@
 bMotion_abstract_register "ranjoins" {
         "are you here to fumigate the moose head?"
-        "are you here to fumigate the moose %VAR{bodypart}?"
+        "are you here to fumigate the moose %VAR{bodypart:bothmixin}?"
         "hey %%"
         "hi %%"
@@ -1172 +1172 @@
         "welcome to our next contestant, %%!"
         "wasn't expecting %%!%|/hides"
-        "hey %% %VAR{food}%VAR{bodypart}"
+        "hey %% %VAR{food}%VAR{bodypart:bothmixin}"
 }
 
@@ -3565 +3565 @@
         "yarr%|%VAR{randomZimness}"
         "%VAR{lols} %VAR{smiles} %colen%|/%VAR{smacks} %himherself in the %VAR{bodypart}"
-        "no i spent my time contemplating how i %VAR{smacked} %ruser in the %VAR{bodypart}"
+        "no i spent my time contemplating how i %VAR{smacked} %ruser in the %VAR{bodypart:nomixin}"
         "yes but i wish i'd gone %VAR{dNouns}-%VAR{dVerbs}ing %VAR{smiles}"
 }
@@ -3577 +3577 @@
         "yahyahayayahayahahayh%colen"
         "indeed i do%|%VAR{randomZimness}"
-        "yarr or i would be %VAR{smacked} with %rusers %VAR{bodypart}!"
+        "yarr or i would be %VAR{smacked} with %rusers %VAR{bodypart:nomixin}!"
         "omg yes"
         "any chance i get %VAR{rarrs}%|%VAR{randomGirness}"
@@ -4040 +4040 @@
         "%VAR{sounds} %VAR{sounds} %VAR{sounds}"
         "ode to %ruser"
-        "shake your %VAR{bodypart}"
+        "shake your %VAR{bodypart:bothmixin}"
         "the Doom Song"
         "God Save the Queen"
@@ -4267 +4267 @@
         "Day %NUMBER{500} %VAR{bb_time}: Big Brother has locked %ruser in the %VAR{bb_places} for %VAR{bb_naughty}"
         "Day %NUMBER{500} %VAR{bb_time}: Big Brother has set the housemates a %VAR{bb_task} task"
-        "Day %NUMBER{500} %VAR{bb_time}: %ruser is in the %VAR{bb_places}. The other housemates are in the %VAR{bb_places}, talking about %OWNER{%ruser{prev}} %VAR{bodypart}"
+        "Day %NUMBER{500} %VAR{bb_time}: %ruser is in the %VAR{bb_places}. The other housemates are in the %VAR{bb_places}, talking about %OWNER{%ruser{prev}} %VAR{bodypart:nomixin}"
         "Day %NUMBER{500} %VAR{bb_time}: %ruser is in the diary room, talking to Big Brother about %VAR{bb_diary}"
         "Day %NUMBER{500} %VAR{bb_time}: %ruser has hidden %OWNER{%ruser} %VAR{bb_posession} in %VAR{bb_hide}"
@@ -4316 +4316 @@
 
 bMotion_abstract_register "bb_diary" {
-        "their %VAR{colours} %VAR{bodypart}"
-        "their %VAR{bodypart}"
+        "their %VAR{colours} %VAR{bodypart:nomixin}"
+        "their %VAR{bodypart:nomixin}"
         "%ruser"
         "how much they like the %VAR{bb_places}"