Changeset 1101 for trunk

Timestamp:

12/15/10 11:00:06 (17 months ago)

Author:

james

Message:

some fixes!

Location:

trunk/plugins/en

Files:

• complex_card.tcl (modified) (1 diff)
• output_VAR.tcl (modified) (2 diffs)
• output_english.tcl (modified) (1 diff)

trunk/plugins/en/complex_card.tcl

@@ -21 +21 @@
                 regexp -nocase "^!card( (adult))?" $text matches 1 modifier
                 if {[string tolower $modifier] == "adult"} {
-                        bMotionDoAction $channel $nick "%%: the %VAR{card_value} of %VAR{scrap_adult_adjectives_t} %VAR{scrap_adult_construction_t:plural}"
+                        bMotionDoAction $channel $nick "%%: the %VAR{card_value} of %VAR{scrap_adult_adjectives_t} %VAR{scrap_adult_construction_t:strip,plural}"
                         return 1
                 }

trunk/plugins/en/output_VAR.tcl

@@ -140 +140 @@
                                         if {[rand 100] > 90} {
                                                 set replacement [bMotion_strip_article $replacement]
-                                                set replacement "%VAR{pluralprefix} $replacement"
-                                                if {[lsearch "strip" $options_list] > -1} {
-                                                        set replacement [bMotion_strip_article $replacement]
+                                                putlog "plural: options list is $options_list"
+                                                if {[lsearch $options_list "strip"] > -1} {
+                                                        set replacement "%VAR{pluralprefix:strip} $replacement"
+                                                } else {
+                                                        set replacement "%VAR{pluralprefix} $replacement"
                                                 }
                                         }
@@ -164 +166 @@
                                         set replacement $temp
                                 }
-                                        
+                                "like" {
+                                        bMotion_putloglev d * "Learning to like $replacement during %VAR expansion"
+                                        bMotion_abstract_add "_bmotion_like" $replacement
+                                }
+                                "dislike" {
+                                        bMotion_putloglev d * "Learning to dislike $replacement during %VAR expansion"
+                                        bMotion_abstract_add "_bmotion_dislike" $replacement
+                                }
                         }
                         bMotion_putloglev 1 * "current replacement is $replacement"

trunk/plugins/en/output_english.tcl

@@ -69 +69 @@
         regsub -all "the an? " $line "the " line
 
+        regsub -all "(an?) (his|her|the)" $line "\\1 " line
+
         #fix double (or more) spaces
         regsub -all "  +" $line " " line