Changeset 1061

Timestamp:

01/16/10 08:54:06 (2 years ago)

Author:

james

Message:

fix some abstracts (mainly %ONWER stuff)

Location:

trunk/plugins/en

Files:

• complex_excuse.tcl (modified) (2 diffs)
• complex_invader.tcl (modified) (1 diff)
• complex_summon.tcl (modified) (2 diffs)
• simple_general.tcl (modified) (1 diff)
• simple_ick.tcl (modified) (2 diffs)

trunk/plugins/en/complex_excuse.tcl

@@ -27 +27 @@
 bMotion_abstract_register "excuse_people" {
         "my"
-        "%OWNER{%ruser}"
+        "%ruser{:owner}"
         "my landlord's"
         "the"
@@ -39 +39 @@
         "the President's"
 }
+bMotion_abstract_add_filter "excuse_people" "%OWNER"
 
 bMotion_abstract_register "excuse_nouns" {

trunk/plugins/en/complex_invader.tcl

@@ -207 +207 @@
         "%ruser: Debate.. now! OR SUFFER!"
         "only now can I reveal that, if elected, I will ensure that every student is given a zombie wiener-dog to do their bidding. Can %ruser say that?"
-        "the grotesque monster-boy avoids the issues! just what does he plan on doing about the size of %OWNER{%ruser} giant head? If I am elected, %OWNER{%ruser} head will be removed, and filled with salted nuts!"
+        "the grotesque monster-boy avoids the issues! just what does he plan on doing about the size of %ruser{:owner} giant head? If I am elected, %ruser{prev:owner} head will be removed, and filled with salted nuts!"
         "the child shrieks like a fruitbat!"
         "well, time to work on my next evil plan."

trunk/plugins/en/complex_summon.tcl

@@ -93 +93 @@
 bMotion_abstract_register "summon_channel_response"
 bMotion_abstract_batchadd "summon_channel_response" {
-        "/prods at %% with %noun"
+        "/prods at %% with %VAR{sillyThings}"
         "through my awesome powers of telepathy, I shall summon %%!!"
         "/uses a smoke signal to get %%'s attention"
@@ -101 +101 @@
         "*pager on desk goes off*%|oh, %OWNER{%%} pager%|better let them know we've got it%|!summon %%%|*pager on desk goes off*%|oh %VAR{unsmiles}"
 }
+bMotion_abstract_add_filter "summon_channel_response" "%noun"
 
 bMotion_abstract_register "summon_privmsg_response"

trunk/plugins/en/simple_general.tcl

@@ -70 +70 @@
 bMotion_plugin_add_simple "nicecar2" {^nice [^ ]+s!?$} 40 [list "wanna show me what they can do?"] "en"
 
+bMotion_plugin_add_simple "luggage" {^[0-9 -]$} 40 [list "amazing, that's the same combination as my luggage!"] "en"

trunk/plugins/en/simple_ick.tcl

@@ -81 +81 @@
 bMotion_abstract_batchadd "ick_covereds" { 
   "custard" "cooking oil" "motor oil" "baby oil" "cream" "whipped cream" "KY" "strawberry jam"
-  "Raspberry yogurt *eg*" "chocolate sauce" "coconut oil" "peanut butter" "dairylea" "%OWNER{%ruser} love juice"
+  "Raspberry yogurt *eg*" "chocolate sauce" "coconut oil" "peanut butter" "dairylea" "%ruser{:owner} love juice"
   "jelly" "assorted food stuffs" "3 week old toffee yogurt"
 }
+bMotion_abstract_add_filter "ick_covereds" "%OWNER"
 
 bMotion_abstract_register "ick_locations"
@@ -93 +94 @@
    "under your desk" "at the local Tesco" "over there -->" "in the shower" "behind the bikesheds"
      "in Essex" "in Wales" "on a hilltop" "at Pontins" "for a porn site"
-  "in %OWNER{%ruser} bed"
+  "in %ruser{:owner} bed"
 }