Changeset 1053 for trunk

Timestamp:

11/15/09 19:01:05 (3 years ago)

Author:

james

Message:

support :prev option on VAR
commit message is commit

Location:

trunk

Files:

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

trunk/modules/abstracts/en/randomstuff.tcl

@@ -6 +6 @@
 ### Used when the channel is not 'active' (default > 300s since last line)
 bMotion_abstract_register "randomStuff" {
+        "%VAR{adjective} %VAR{sillyThings:strip} is %VAR{adjective:prev}"
+        "%VAR{nice_adjective} %VAR{sillyThings:strip} is %VAR{nice_adjective:prev}"
         "ok, we've got the hot tub hot, the wine cooler's cool: it's %VAR{sillyThings:strip} time!"
         "eww! i touched my own %VAR{bodypart}!"

trunk/plugins/en/output_VAR.tcl

@@ -25 +25 @@
         bMotion_putloglev 4 * "bMotion_plugin_output_VAR $channel $line"
         global BMOTION_MIXIN_NONE BMOTION_MIXIN_REVERSE BMOTION_MIXIN_DEFAULT BMOTION_MIXIN_BOTH
-
+        
         set line [string map { "%noun" "%VAR{sillyThings}" } $line]
 
@@ -107 +107 @@
                 foreach option $options_list {
                         switch $option {
+                                "prev" {
+                                        set replacement [bMotion_plugins_settings_get "output:VAR" "last" $channel "$abstract"]
+                                }
                                 "strip" {
                                         set replacement [bMotion_strip_article $replacement]
@@ -146 +149 @@
                         return ""
                 }
+
+                bMotion_plugins_settings_set "output:VAR" "last" $channel $abstract $replacement
                 set line [string replace $line $location [expr $location + [string length $matches] - 1] $replacement]