Changeset 1031

Timestamp:

09/11/09 05:40:45 (2 years ago)

Author:

james

Message:

Add revmixin and nomixin options to %VAR, to allow the gender-mixin stuff to be controlled

Location:

trunk

Files:

• modules/abstract.tcl (modified) (5 diffs)
• modules/abstracts/en/randomstuff.tcl (modified) (4 diffs)
• plugins/en/output_VAR.tcl (modified) (4 diffs)

trunk/modules/abstract.tcl

@@ -66 +66 @@
 # fileformat is simply one per line.
 
+# default = mixin own gender
+# reverse = mixin opposite gender
+# none = don't mixin at all
+set BMOTION_MIXIN_DEFAULT 0
+set BMOTION_MIXIN_REVERSE 1
+set BMOTION_MIXIN_NONE 2
+
 if { [bMotion_setting_get "abstractMaxAge"] != "" } {
   set bMotion_abstract_max_age [bMotion_setting_get "abstractMaxAge"]
@@ -340 +347 @@
 
         set contents [bMotion_abstract_all $abstract]
-        putlog $contents
 
         if {[llength $contents] == 0} {
@@ -366 +372 @@
 }
 
-proc bMotion_abstract_get { abstract } {
-        bMotion_putloglev 5 * "bMotion_abstract_get ($abstract)"
+proc bMotion_abstract_get { abstract { mixin_type 0 } } {
+        bMotion_putloglev 5 * "bMotion_abstract_get ($abstract $mixin_type)"
   global bMotion_abstract_contents bMotion_abstract_timestamps bMotion_abstract_max_age bMotion_abstract_last_get bMotionInfo
 
@@ -388 +394 @@
 
         # look for male and female versions, and merge in if needed
-        if [bMotion_abstract_exists "${abstract}_$bMotionInfo(gender)"] {
-                # mix-in the gender one with the vanilla one
-                bMotion_putloglev 1 * "mixing in $bMotionInfo(gender) version of $abstract"
-                set final_version [concat [bMotion_abstract_all $abstract] [bMotion_abstract_all "${abstract}_$bMotionInfo(gender)"]]
-        } else {
-                set final_version [bMotion_abstract_all $abstract]
-        }
-
+        set final_version [bMotion_abstract_all $abstract]
+        switch $mixin_type {
+                0 {
+                        if [bMotion_abstract_exists "${abstract}_$bMotionInfo(gender)"] {
+                        # 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)"]]
+                        } else {
+                                set final_version [bMotion_abstract_all $abstract]
+                        }
+                }
+                1 {
+                        if {[bMotion_setting_get "gender"] == "male"} {
+                                set gender "female"
+                        } else {
+                                set gender "male"
+                        }
+                        if [bMotion_abstract_exists "${abstract}_$gender"] {
+                        # mix-in the gender one with the vanilla one
+                                bMotion_putloglev 1 * "mixing in $gender version of $abstract"
+                                set final_version [concat $final_version [bMotion_abstract_all "${abstract}_$gender"]]
+                        } else {
+                                set final_version [bMotion_abstract_all $abstract]
+                        }
+                }
+                2 {
+                        # noop, we did it already before the switch
+                }
+                default {
+                        putlog "bMotion ERROR: unknown mixin type $mixin_type for abstract $abstract"
+                }
+        }
 
         if {[llength $final_version] == 0} {
@@ -634 +664 @@
 bMotion_abstract_revive_language
 
+
 bMotion_putloglev d * "abstract module loaded"

trunk/modules/abstracts/en/randomstuff.tcl

@@ -24 +24 @@
         "Check out my %VAR{bodypart:plural}"
         "I have expendable %VAR{bodypart:plural}"
+        "I have expandable %VAR{bodypart:plural}"
         "%BOT[The Ambassador's receptions are noted in society for their host's exquisite taste that captivates his guests.]%|Monsieur, with this %VAR{sillyThings:strip} you are really spoiling us!"
         "where there's a snack gap, a %VAR{PROM} fits"
@@ -207 +208 @@
 
         "WHOOSH *DONG*"
-        "i'm awash with %VAR{bodypart}s"
+        "i'm awash with %VAR{bodypart:plural}"
         "I feel a great disatisfaction within my bowels."
         "Pardon me. Do you have any grey poupon?"
@@ -372 +373 @@
         "i'm giving up evil science and taking up even gardening instead"
         "noooo! enormous naked buttocks heading towards my head!%|i'm being simultaneously crushed and embarrassed to death"
-        "yay! %VAR{bodypart}s!"
+        "yay! %VAR{bodypart:plural}!"
 }
 
@@ -380 +381 @@
 ### Mixed in with list above
 bMotion_abstract_register "randomStuff_male" {
+        "I always thought the most sensual part of a woman was the %VAR{bodypart:revmixin}"
         "Looks like the squirrel's been showing everyone where he keeps his nuts."
         "You wanna see some stuff I'm not supposed to show anyone?"

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
 
         set line [string map { "%noun" "%VAR{sillyThings}" } $line]
@@ -30 +31 @@
         regsub {%VAR\{([^\}]+)\}\{strip\}} $line "%VAR{\\1:strip}" line
 
-        if {[regexp -nocase {(%VAR\{([^\}:]+)(:[^\}]+)?\}(\{strip\})?)} $line matches whole_thing abstract options clean]} {
+        if {[regexp -nocase {(%VAR\{([^\}:]+)(:([^\}]+))?\}(\{strip\})?)} $line matches whole_thing abstract 1 options clean]} {
                 global $abstract
+
+                bMotion_putloglev 1 * "options for $abstract are $options"
+
+                # check options
+                if {$options != ""} {
+                        set options_list [split $options ","]
+                } else {
+                        set options_list [list]
+                }
+                bMotion_putloglev 1 * "options list is $options_list"
+
+                if {$clean == "{strip}"} {
+                        lappend options_list "clean"
+                }
+
+                set mixin_type $BMOTION_MIXIN_DEFAULT
+
+                if {[lsearch $options_list "revmixin"] > -1} {
+                        bMotion_putloglev 1 * "mixin type for $abstract is reverse"
+                        set mixin_type $BMOTION_MIXIN_REVERSE
+                } elseif {[lsearch $options_list "nomixin"] > -1} {
+                        bMotion_putloglev 1 * "mixin type for $abstract is none"
+                        set mixin_type $BMOTION_MIXIN_NONE
+                }
+
                 #see if we have a new-style abstract available
-                set newText [bMotion_abstract_get $abstract]
+                set newText [bMotion_abstract_get $abstract $mixin_type]
                 set replacement ""
                 if {$newText == ""} {
@@ -49 +75 @@
                 }
 
-                # check options
-                set options [string range $options 1 end]
-                if {$options != ""} {
-                        set options_list [split $options ","]
-                } else {
-                        set options_list [list]
-                }
-
-                if {$clean == "{strip}"} {
-                        lappend options_list "clean"
-                }
 
                 if {[lsearch $options_list "strip"] == -1} {
@@ -131 +146 @@
 }
 
+
 bMotion_plugin_add_output "VAR" bMotion_plugin_output_VAR 1 "en" 3