Changeset 884

Timestamp:

02/13/08 17:42:39 (11 months ago)

Author:

znx

Message:

Starting to get rid of bMotionCache, see #13

Location:

trunk

Files:

• bMotion.tcl (modified) (2 diffs)
• modules/plugins.tcl (modified) (2 diffs)
• modules/variables.tcl (modified) (1 diff)
• plugins/en/complex_shocked.tcl (modified) (1 diff)
• plugins/en/complex_smiley.tcl (modified) (1 diff)

trunk/bMotion.tcl

@@ -66 +66 @@
 }
 
+# needed for variables
+if {$bMotion_testing == 1} {
+  putlog "... loading plugin settings"
+}
+source "$bMotionModules/plugins_settings.tcl"
+
 # init default variables
 if {$bMotion_testing == 1} {
@@ -175 +181 @@
 source "$bMotionModules/mood.tcl"
 
-if {$bMotion_testing == 1} {
-  putlog "... loading plugin settings"
-}
-source "$bMotionModules/plugins_settings.tcl"
 
 ### That's everything but the plugins stuff loaded. Now load extra modules

trunk/modules/plugins.tcl

@@ -81 +81 @@
 proc bMotion_plugin_find_simple { text lang } {
   bMotion_putloglev 3 * "bMotion_plugin_find_simple: text = $text, lang = $lang"
-  global bMotion_plugins_simple botnicks bMotionCache
+  global bMotion_plugins_simple botnicks
   set s [lsort [array names bMotion_plugins_simple]]
 
@@ -97 +97 @@
         set c [rand 100]
         bMotion_putloglev 4 * "simple plugin $key matches"
-        if {$bMotionCache(last_simple) == $key} {
+        if {[bMotion_plugins_settings_get "system" "last_simple" "" ""] == $key} {
           bMotion_putloglev 3 * "trying to trigger same simple plugin twice in a row, aborting"
           return ""
         }
-              set bMotionCache(last_simple) $key
+            bMotion_plugins_settings_set "system" "last_simple" "" "" $key
         if {$chance > $c} {
           bMotion_putloglev 4 * "  `- firing"

trunk/modules/variables.tcl

@@ -66 +66 @@
   set bMotionCache(remoteBot) ""
   set bMotionCache(randomUser) ""
-  set bMotionCache(lastPlugin) ""
 
-  set bMotionCache(last_simple) ""
+  bMotion_plugins_settings_set "system" "lastPlugin" "" "" ""
+  bMotion_plugins_settings_set "system" "last_simple" "" "" ""
 
 #this is set later

trunk/plugins/en/complex_shocked.tcl

@@ -13 +13 @@
 
 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"
-

trunk/plugins/en/complex_smiley.tcl

@@ -22 +22 @@
 proc bMotion_plugin_complex_smiley { nick host handle channel text } {
   global mood
-  global bMotionCache
 
   if {![bMotion_interbot_me_next $channel]} { return 0 }
 
-  if {$bMotionCache(lastPlugin) == "bMotion_plugin_complex_smiley"} {
-    return 0
+  foreach i {"smiley" "smiley2" "smiley3" "smiley4" "smiley5"} {
+        bMotion_putloglev 2 * "checking $i"
+        
+    if {[bMotion_plugin_history_check $channel "complex" $i]} {
+          return 0
+        }
   }