as_html -> as_text

diff --git a/conf/channels.conf b/conf/channels.conf
index e69de29..2e2d2c4 100644 (file)
--- a/conf/channels.conf
+++ b/conf/channels.conf
@@ -0,0 +1,40 @@
+channel #tcod
+  lobotomized False
+  defaultAllow True
+  capability -halfop
+  capability -protected
+  capability -op
+  capability -voice
+
+channel #cafe
+  lobotomized False
+  defaultAllow True
+  capability -halfop
+  capability -protected
+  capability -op
+  capability -voice
+
+channel #bot
+  lobotomized False
+  defaultAllow True
+  capability -halfop
+  capability -protected
+  capability -op
+  capability -voice
+
+channel #pk
+  lobotomized False
+  defaultAllow True
+  capability -halfop
+  capability -protected
+  capability -op
+  capability -voice
+
+channel #veekun
+  lobotomized False
+  defaultAllow True
+  capability -halfop
+  capability -protected
+  capability -op
+  capability -voice
+

diff --git a/dywypi.conf b/dywypi.conf
index d68dfe3..f12289b 100644 (file)
--- a/dywypi.conf
+++ b/dywypi.conf
@@ -637,7 +637,7 @@ supybot.directories.log: ./logs
 #
 # Default value:  
 ###
-supybot.plugins: Admin Math Misc User Owner Config Pokedex Channel Karma
+supybot.plugins: Admin Misc Pokedex WWWJDIC Channel User Unicode Owner Config NetHack Math Karma
 
 ###
 # Determines whether this plugin is loaded by default.
@@ -804,6 +804,18 @@ supybot.plugins.Misc.last.nested.includeNick: False
 ###
 # Determines whether this plugin is loaded by default.
 ###
+supybot.plugins.NetHack: True
+
+###
+# Determines whether this plugin is publicly visible.
+#
+# Default value: True
+###
+supybot.plugins.NetHack.public: True
+
+###
+# Determines whether this plugin is loaded by default.
+###
 supybot.plugins.Owner: True
 
 ###
@@ -840,7 +852,19 @@ supybot.plugins.Pokedex.public: True
 #
 # Default value: 
 ###
-supybot.plugins.Pokedex.databaseURL: 
+supybot.plugins.Pokedex.databaseURL: sqlite:////home/eevee/beta.veekun.com/veekun/pokedex.db
+
+###
+# Determines whether this plugin is loaded by default.
+###
+supybot.plugins.Unicode: False
+
+###
+# Determines whether this plugin is publicly visible.
+#
+# Default value: True
+###
+supybot.plugins.Unicode.public: True
 
 ###
 # Determines whether this plugin is loaded by default.
@@ -855,6 +879,18 @@ supybot.plugins.User: True
 supybot.plugins.User.public: True
 
 ###
+# Determines whether this plugin is loaded by default.
+###
+supybot.plugins.WWWJDIC: True
+
+###
+# Determines whether this plugin is publicly visible.
+#
+# Default value: True
+###
+supybot.plugins.WWWJDIC.public: True
+
+###
 # Determines whether the bot will always load important plugins (Admin,
 # Channel, Config, Misc, Owner, and User) regardless of what their
 # configured state is. Generally, if these plugins are configured not to

diff --git a/plugins/Pokedex/plugin.py b/plugins/Pokedex/plugin.py
index 158e509..fd728e2 100644 (file)
--- a/plugins/Pokedex/plugin.py
+++ b/plugins/Pokedex/plugin.py
@@ -162,7 +162,7 @@ class Pokedex(callbacks.Plugin):
                 power=obj.power,
                 accuracy=obj.accuracy,
                 pp=obj.pp,
-                effect=unicode(obj.short_effect.as_html),
+                effect=unicode(obj.short_effect.as_text),
                 link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )