Changeset 1135

Timestamp:

01/26/12 14:15:21 (4 months ago)

Author:

james

Message:

fix narfs append, hopefully
fix failure case of nazi 3 plugin
content additions and fixes

Location:

trunk

Files:

• modules/abstracts/en/abstracts.tcl (modified) (10 diffs)
• modules/output.tcl (modified) (2 diffs)
• plugins/en/complex_nazi.tcl (modified) (1 diff)
• plugins/en/complex_scrap.tcl (modified) (5 diffs)
• plugins/en/output_append.tcl (modified) (1 diff)

trunk/modules/abstracts/en/abstracts.tcl

@@ -85 +85 @@
         "bah"
         "/goes to find someone more interesting to talk to"
-        "%SMILE{sad}"
+        "%SMILEY{sad}"
         "fine"
         "/stamps foot%|*sulk*"
@@ -137 +137 @@
 
 bMotion_abstract_register "satOns" {
-        "hey ow %SMILE{sad}"
+        "hey ow %SMILEY{sad}"
         "heeeyyy :O"
         "bah"
@@ -889 +889 @@
         "*CRUMP*"
         "/flattens %%"
-        "hey %SMILE{sad}"
+        "hey %SMILEY{sad}"
         "oi"
         "/sails through the air towards %%"
-        "loookkk ooouuuttt beellooww!%|*CRUMP*%|ow %SMILE{sad}"
+        "loookkk ooouuuttt beellooww!%|*CRUMP*%|ow %SMILEY{sad}"
         "/flies through the air with the greatest of ease"
         "/does a triple inverted twist somersault and lands neatly next to %%"
@@ -918 +918 @@
         "%VAR{oops}"
         "%VAR{oops}, %%"
-        "%colen"
         "ffs"
         "grrr %%"
@@ -926 +925 @@
 }
 bMotion_abstract_add_filter "typoFix" "SETTING"
+
+# %colen doesn't work when in typoFix mode, for now
+bMotion_abstract_add_filter "typoFix" "%colen"
 
 bMotion_abstract_register "blehs" {
@@ -1105 +1107 @@
 
 bMotion_abstract_register "stolens" {
-        "Hey NO %SMILE{sad}%|That's mine%|/sulks at %%"
-        "heeeeyyyy%|%SMILE{sad}"
+        "Hey NO %SMILEY{sad}%|That's mine%|/sulks at %%"
+        "heeeeyyyy%|%SMILEY{sad}"
         "bah%|/steals it back"
         "/smacks %%"
@@ -3116 +3118 @@
         "/falls over%|%bot\[50,¬VAR{picksUp}\]"
         "/is blown away by force of %%'s statement%|%bot\[50,¬VAR{picksUp}\]"
-        "ow my eyes %SMILE{sad}"
+        "ow my eyes %SMILEY{sad}"
         "/blinks"
         ":O"
@@ -3369 +3371 @@
         "/vanishes from the continuum"
         "/ceases to have ever existed"
-        "hey! %SMILE{sad}"
+        "hey! %SMILEY{sad}"
         "/dodges%|/hits d+1 and does Chinese Fan on %%"
 }
@@ -3785 +3787 @@
         "always %VAR{rarrs}"
         "i do%|despite having no %VAR{bodypart}"
-        "i did till my %VAR{bodypart} %VAR{fellOffs} %SMILE{bigsad}"
+        "i did till my %VAR{bodypart} %VAR{fellOffs} %SMILEY{bigsad}"
         "does it mean i get pie?"
         "yahyahayayahayahahayh%colen"
@@ -3828 +3830 @@
         "love to%|%VAR{randomZimness}"
         "only if %ruser can watch"
-        "if i had any arms i would%|%SMILE{sad}"
+        "if i had any arms i would%|%SMILEY{sad}"
         "if my %VAR{bodypart} would stop %VAR{dVerbs}ing"
 }

trunk/modules/output.tcl

@@ -153 +153 @@
                                 bMotion_putloglev 2 * "macro: found macro $macro at $current_pos"
                                 set plugin [bMotion_plugin_find_output "en" "" 0 10 $macro]
+                                if {[llength $plugin] == 0} {
+                                        # oh no
+                                        bMotion_putloglev d * "macro: didn't get any plugins for $macro"
+                                }
+
                                 if {[llength $plugin] == 1} {
                                 # call plugin
@@ -281 +286 @@
                         }
                 }
+        } else {
+                bMotion_putloglev 1 * "skipped plugin processing on $text due to noTypo being set"
         }
 

trunk/plugins/en/complex_nazi.tcl

@@ -44 +44 @@
 
         if [regexp -nocase "\\mme and (\[a-z\]+)( \[a-z\]+)?" $text matches other verb] {
+                if {($other == "I") || ($other == "i")} {
+                        return 0
+                }
+
                 if {$verb == ""} {
                         if {![bMotion_interbot_me_next $channel]} {

trunk/plugins/en/complex_scrap.tcl

@@ -140 +140 @@
   "very bad"
   "terrible"
-
   "average"
   "amateur"
@@ -148 +147 @@
   "normal"
   "fair"
-
   "master crafted"
   "perfect"
@@ -216 +214 @@
   "fully automatic"
   "semi automatic"
+        "gritty"
 }
 bMotion_abstract_add_filter "scrap_adjectives" "mamoth"
@@ -418 +417 @@
   "voluptuous"
   "bound"
-
   "minging"
   "doggish"
@@ -539 +537 @@
         "blowjob"
         "gentials"
+        "fart"
         "dick"
 }

trunk/plugins/en/output_append.tcl

@@ -97 +97 @@
 # actually, this might not be needed, but just in case :)
 bMotion_abstract_add_filter "preciouses" {^[^ ]}
-bMotion_abstract_add_filter "narfs" {^[^ ]}
 
 bMotion_plugin_add_output "append" bMotion_plugin_output_append 1 "en" 11