Changeset 1032

Timestamp:

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

Author:

james

Message:

support bothmixin option too

Location:

trunk

Files:

• modules/abstract.tcl (modified) (3 diffs)
• modules/abstracts/en/abstracts.tcl (modified) (7 diffs)
• modules/abstracts/en/randomstuff.tcl (modified) (1 diff)
• plugins/en/output_VAR.tcl (modified) (4 diffs)

trunk/modules/abstract.tcl

@@ -72 +72 @@
 set BMOTION_MIXIN_REVERSE 1
 set BMOTION_MIXIN_NONE 2
+set BMOTION_MIXIN_BOTH 3
 
 if { [bMotion_setting_get "abstractMaxAge"] != "" } {
@@ -400 +401 @@
                         # mix-in the gender one with the vanilla one
                                 bMotion_putloglev 1 * "mixing in $bMotionInfo(gender) version of $abstract"
-                                set final_version $final_version [bMotion_abstract_all "${abstract}_$bMotionInfo(gender)"]]
+                                set final_version [concat $final_version [bMotion_abstract_all "${abstract}_$bMotionInfo(gender)"]]
                         } else {
                                 set final_version [bMotion_abstract_all $abstract]
@@ -421 +422 @@
                 2 {
                         # noop, we did it already before the switch
+                }
+                3 {
+                        if [bMotion_abstract_exists "${abstract}_male"] {
+                                bMotion_putloglev 1 * "mixing in male version of $abstract"
+                                set final_version [concat $final_version [bMotion_abstract_all "${abstract}_male"]]
+                        }
+                        if [bMotion_abstract_exists "${abstract}_female"] {
+                                bMotion_putloglev 1 * "mixing in female version of $abstract"
+                                set final_version [concat $final_version [bMotion_abstract_all "${abstract}_female"]]
+                        }
                 }
                 default {

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}"

trunk/modules/abstracts/en/randomstuff.tcl

@@ -562 +562 @@
         "r"
         "*schwing*"
-        "oh really well what do you think, talking %VAR{bodypart}?"
+        "oh really well what do you think, talking %VAR{bodypart:bothmixin}?"
         "oh yeah? fuck your theory."
         "PUT YOUR KNICKERS ON AND GO GET ME A CUP OF TEA"

trunk/plugins/en/output_VAR.tcl

@@ -24 +24 @@
 proc bMotion_plugin_output_VAR { channel line } {
         bMotion_putloglev 4 * "bMotion_plugin_output_VAR $channel $line"
-        global BMOTION_MIXIN_NONE BMOTION_MIXIN_REVERSE BMOTION_MIXIN_DEFAULT
+        global BMOTION_MIXIN_NONE BMOTION_MIXIN_REVERSE BMOTION_MIXIN_DEFAULT BMOTION_MIXIN_BOTH
 
         set line [string map { "%noun" "%VAR{sillyThings}" } $line]
@@ -56 +56 @@
                         bMotion_putloglev 1 * "mixin type for $abstract is none"
                         set mixin_type $BMOTION_MIXIN_NONE
+                } elseif {[lsearch $options_list "bothmixin"] > -1} {
+                        bMotion_putloglev 1 * "mixin type for $abstract is both"
+                        set mixin_type $BMOTION_MIXIN_BOTH
                 }
 
@@ -74 +77 @@
                         set replacement $newText
                 }
-
 
                 if {[lsearch $options_list "strip"] == -1} {
@@ -118 +120 @@
                                 }
                                 "plural" {
+                                        bMotion_putloglev 1 * "pluralising $replacement"
                                         set replacement [bMotionMakePlural $replacement]
                                 }