Changeset 1074 for trunk

Timestamp:

03/17/10 23:31:22 (2 years ago)

Author:

james

Message:

Clear the ruser_skip setting after processing output (to make sure)
Use ruser_skip when we're being shown something

Location:

trunk

Files:

• modules/output.tcl (modified) (1 diff)
• plugins/en/action_complex_shows.tcl (modified) (2 diffs)

trunk/modules/output.tcl

@@ -282 +282 @@
         }
 
+        # clear this in case a plugin ended up not using it in an abstract
+        bMotion_plugins_settings_set "system" "ruser_skip" $channel ""
+
         #make sure the line wasn't set to blank by a plugin (may be trying to block output)
         set line [string trim $text]

trunk/plugins/en/action_complex_shows.tcl

@@ -17 +17 @@
         if {[regexp -nocase "(shows) $botnicks (a|an|the|some|his|her|its)? ?(.+)" $text bling act bot preposition item]} {
           bMotion_putloglev d * "bMotion: Was shown !$preposition $item! by $nick in $channel"
+
+                bMotion_plugins_settings_set "system" "ruser_skip" $channel "" $nick
 
       # the following code is HORRIBLE, but that's just because I can't figure out TCL
@@ -144 +146 @@
   "%REPEAT{3:6:o}h, %VAR{show_adjectives}!%|/steals %% and runs off%|ALL MINE NOW%colen%|/sells %% on ebay"
   "now that's %VAR{show_adjectives}"
-  "p%REPEAT{2:5:f}t.. wait until you see my %VAR{sillyThings}{strip}"
+  "p%REPEAT{2:5:f}t.. wait until you see my %VAR{sillyThings:strip}"
   "/takes a picture"
-  "/contemplates%|it'd be nicer if it had %PLURAL{%VAR{sillyThings}{strip}}"
-  "I prefer %OWNER{%ruser}"
+  "/contemplates%|it'd be nicer if it had %VAR{sillyThings:strip,plural}"
+  "I prefer %ruser{:owner}"
   "/admires %%"
   "/replaces %% with a cheap %VAR{colours} plastic copy%|bwaha%REPEAT{1:4:ha}"
 }
+bMotion_abstract_add_filter "show_generic" "%PLURAL"
+bMotion_abstract_add_filter "show_generic" "%OWNER"
+