Changeset 1027

Timestamp:

08/29/09 05:21:06 (2 years ago)

Author:

james

Message:

fix some broken abstracts as found by the diagnostics

Location:

trunk

Files:

• modules/abstracts/en/abstracts.tcl (modified) (4 diffs)
• modules/abstracts/en/randomstuff.tcl (modified) (2 diffs)
• plugins/en/complex_summon.tcl (modified) (2 diffs)

trunk/modules/abstracts/en/abstracts.tcl

@@ -30 +30 @@
         "caught fire"
         "got eaten"
-        "turned into %noun"
+        "turned into %VAR{sillyThings}"
         "got discontinued"
         "ran out"
@@ -41 +41 @@
         "got turned into %VAR{sillyThings}"
 }
+bMotion_abstract_add_filter "fellOffs" "%noun"
 
 bMotion_abstract_register "jokeends" {
@@ -175 +176 @@
         "rainbows"
         "kittens"
-        "%noun"
-}
+        "%VAR{sillyThings}"
+}
+bMotion_abstract_add_filter "answerWhats" "%noun"
 
 bMotion_abstract_register "answerWhos" {
@@ -5465 +5467 @@
         "r"
         "r %VAR{smiles}"
-        "r %VAR{sads}"
+        "r %VAR{unsmiles}"
         "r "
 }
+bMotion_abstract_add_filter "theRs" "sads"
 
 source "$bMotionModules/abstracts/en/randomstuff.tcl"

trunk/modules/abstracts/en/randomstuff.tcl

@@ -425 +425 @@
         "/plays with herself"
         "That ain't my belly button"
-        "This one time, at band camp, I put %noun..."
+        "This one time, at band camp, I put %VAR{sillyThings}..."
         "/considers breast implants%|%BOT\[/feels up %ruser{female} to check¬|true, they aren't as good as %ruser{prev}'s¬|/feels up ¬ruser{prev}'s breasts¬|mmmm ¬VAR{smiles}\]"
         "/considers sexchange operation%|/looks at %ruser{male}%|Maybe not"
@@ -433 +433 @@
         "hi %ruser! I'm miniature superwoman!%|no %ruser{prev}, don't touch me there!%|n%REPEAT{5:15:o}! %VAR{unsmiles}"
 }
+bMotion_abstract_add_filter "randomStuff_female" "%noun"
 
 

trunk/plugins/en/complex_summon.tcl

@@ -63 +63 @@
                                 set msg [doInterpolation "%VAR{summon_privmsg_response}" $nick ""]
                                 # replacements (TODO: may not be needed after doInterpolation)
-                                regsub "%chan" $msg $channel msg 
+                                regsub "%channel" $msg $channel msg 
                                 regsub "%%" $msg $nick msg
                                 # notify
@@ -104 +104 @@
 bMotion_abstract_register "summon_privmsg_response"
 bMotion_abstract_batchadd "summon_privmsg_response" {
-        "FYI: %% was looking for you on %chan"
-        "just so you know %% was asking about you on %chan"
-        "%% was too lazy to message you from %chan themselves so I had to"
-        "life was good until %% started shouting for you on %chan"
-        "once upon a time, in a land called %chan, %% was asking about you"
-        "Oi! %chan now! %% looking for you!"
+        "FYI: %% was looking for you on %channel"
+        "just so you know %% was asking about you on %channel"
+        "%% was too lazy to message you from %channel themselves so I had to"
+        "life was good until %% started shouting for you on %channel"
+        "once upon a time, in a land called %channel, %% was asking about you"
+        "Oi! %channel now! %% looking for you!"
 }
+bMotion_abstract_add_filter "summon_privmsg_response" "%chan(?!nel)"
 
 bMotion_abstract_register "summon_channel_idiot"