Index: complex_shocked.tcl
===================================================================
--- complex_shocked.tcl	(revision 748)
+++ complex_shocked.tcl	(working copy)
@@ -12,17 +12,17 @@
 ###############################################################################
 
 proc bMotion_plugin_complex_shock { nick host handle channel text } {
+	#if we spoke last, it's probable this is a reaction to us being
+	# surprised at yourself is lame
+	if {$channel == [bMotion_plugins_settings_get "complex:shock" "last" $channel ""]} {
+		return 0
+	}
 
-  global bMotionCache
-  #if we spoke last, it's probable this is a reaction to us
-  #being surprised at yourself is lame
-  if {$bMotionCache($channel,last)} {
-    return 0
-  }
-
-  bMotionDoAction $channel $nick "%VAR{shocked}"
-  return 1
+	# set channel to stop use being suprised at ourselves!
+	bMotion_plugins_settings_set "complex:shock" "last" $channel "" ""
+	
+	bMotionDoAction $channel $nick "%VAR{shocked}"
+	return 1
 }
 
 bMotion_plugin_add_complex "shocked" "^((((=|:|;)-?(o|0))|(!+))|blimey|crumbs|i say)$" 40 bMotion_plugin_complex_shock "en"
-