Changeset 1109 for trunk

Timestamp:

01/17/11 15:52:28 (16 months ago)

Author:

james

Message:

add initial oversleep code
tidy up a couple of things in events.tcl

Location:

trunk

Files:

• modules/abstracts/en/abstracts.tcl (modified) (1 diff)
• modules/events.tcl (modified) (3 diffs)
• modules/system.tcl (modified) (2 diffs)
• modules/variables.tcl (modified) (1 diff)
• plugins/en/complex_hello.tcl (modified) (1 diff)

trunk/modules/abstracts/en/abstracts.tcl

@@ -5867 +5867 @@
 }
 
+bMotion_abstract_register "overslept" {
+        "%VAR{swear}!%|/overslept %VAR{unsmiles}"
+        "%VAR{swear}!%|slept through my alarm %VAR{unsmiles}"
+        "oh %VAR{swear}, overslept%|all because i was %VAR{sillyVerbs:presentpart} too late last night"
+        "%VAR{swear}, slept though my alarm"
+}
+
+bMotion_abstract_register "oversleep_rush" {
+        "/gets dressed so quickly he forgets to put on %VAR{clothes}"
+        "now i don't have time for a delicious breakfast of %VAR{foods}"
+        "/absent-mindedly puts on %VAR{foods} and eats $VAR{clothes} for breakfast"
+}
+
+bMotion_abstract_register "swear" {
+        "fuck"
+        "shit"
+        "bollocks"
+        "cunt"
+        "arse"
+        "damn"
+        "drat"
+        "bugger"
+        "rats"
+}
+
 bMotion_abstract_add_filter "_all" "\{strip\}\}"
 bMotion_abstract_add_filter "_all" "\}\{strip\}"

trunk/modules/events.tcl

@@ -297 +297 @@
                         set result 0
                         set result [$callback $nick $host $handle $channel $text]
-                        bMotion_putloglev d * "returned from $callback"
+                        bMotion_putloglev 2 * "returned from $callback"
                         set bMotionCache(lastPlugin) $callback
                         bMotion_plugin_history_add $channel "complex" $callback
@@ -366 +366 @@
         #tell the names we have 
         #TODO: move this into a plugin?
-        if [regexp -nocase "${botnicks}:?,? say my names?(,? bitch)?" $text] {
+        if [regexp -nocase "${botnicks}:?,? (say my names?|what'?s my name)" $text] {
                 if {($handle == "*") || ($handle == "")}        {
                 #no handle = no saving IRL
@@ -381 +381 @@
                 set realnames [getuser $handle XTRA irl]
                 if {$realnames == ""} {
-                        bMotionDoAction $channel $nick "Ah you must be %%. (You have not set any IRL names.)" "" 1
+                        bMotionDoAction $channel $nick "Ah, you must be %%. (You have not set any IRL names.)" "" 1
                 } else {
                         bMotionDoAction $channel $nick "Your IRL name(s) are:\002 %2 \002" $realnames 1

trunk/modules/system.tcl

@@ -1082 +1082 @@
 }
 
+
+# realise we overslept
+proc bMotion_overslept { { onlychan "" } } {
+        global bMotionSettings BMOTION_SLEEP
+        if {[bMotion_setting_get "asleep"] != $BMOTION_SLEEP(OVERSLEEPING)} {
+                bMotion_putloglev d * "overslept timer fired but I wasn't oversleeping"
+                return
+        }
+
+        set bMotionSettings(asleep) $BMOTION_SLEEP(AWAKE)
+
+        if {$onlychan == ""} {
+                set chanlist $bMotionChannels
+        } else {
+                set chanlist [list $onlychan]
+        }
+
+        foreach chan $chanlist {
+                if {[bMotion_is_active_enough $chan]} {
+                        bMotionDoAction $chan "" "%VAR{overslept}"
+                }
+        }
+}
+
 proc bMotion_wake_up { } {
         global bMotionSettings BMOTION_SLEEP bMotionChannels
@@ -1088 +1112 @@
         if {$bMotionSettings(asleep) == $BMOTION_SLEEP(ASLEEP)} {
                 bMotion_putloglev 3 * "considering asleep -> awake"
+                if {[rand 100] > 95} {
+                        putlog "bMotion: really quite tired today... think I'll stay in bed a bit longer"
+                        set snooze [expr [rand 120] + 30]
+                        timer $snooze bMotion_overslept
+                        putlog "bMotion: going to oversleep by $snooze minutes"
+                        set bMotionSettings(asleep) $BMOTION_SLEEP(OVERSLEEPING)
+
+                        set hour [bMotion_setting_get "bedtime_hour"]
+                        set minute [bMotion_setting_get "bedtime_minute"]
+                        set bMotionSettings(sleepy_nextchange) [bMotion_sleep_next_event "$hour:$minute"]
+
+                        return
+                }
+
                 if {[rand 10] > 7} {
                         putlog "bMotion: woke up!"

trunk/modules/variables.tcl

@@ -92 +92 @@
 set BMOTION_SLEEP(BEDTIME) 1
 set BMOTION_SLEEP(ASLEEP) 2
+set BMOTION_SLEEP(OVERSLEEPING) 3
 
 # start off awake

trunk/plugins/en/complex_hello.tcl

@@ -22 +22 @@
 
         set lastGreeted [bMotion_plugins_settings_get "complex:hello" "lastGreeted" $channel ""]
+
+        global BMOTION_SLEEP
+        if {[bMotion_setting_get "asleep"] == $BMOTION_SLEEP(OVERSLEEPING)} {
+                bMotion_overslept $channel
+                set bMotionInfo(away) 0
+                set bMotionInfo(silence) 0
+                return
+        }
 
         if {$bMotionInfo(away) == 1} {