diff options
| author | jason | 2012-07-21 05:09:27 -0600 |
|---|---|---|
| committer | jason | 2012-07-21 05:09:27 -0600 |
| commit | 9dcfb0d64820e883eb75529f8683ee3dcae52a67 (patch) | |
| tree | 615cee282013f5b01982860e68183707721b94b4 | |
| parent | 0c696cadfeadabbc89fa63010f71b3cf0290c21a (diff) | |
| download | warmachine-9dcfb0d64820e883eb75529f8683ee3dcae52a67.tar.gz warmachine-9dcfb0d64820e883eb75529f8683ee3dcae52a67.zip | |
Updated warmachine a bit.
| -rw-r--r-- | conf/users.py | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | warmachine.py | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/conf/users.py b/conf/users.py index 3ef926d..e8fbe38 100644 --- a/conf/users.py +++ b/conf/users.py | |||
| @@ -1,6 +1,2 @@ | |||
| 1 | user = [] | 1 | user = [] |
| 2 | user.append('ashcrow') | ||
| 3 | user.append('beav') | ||
| 4 | user.append('wes') | ||
| 5 | user.append('com4') | 2 | user.append('com4') |
| 6 | user.append('jason_') | ||
diff --git a/warmachine.py b/warmachine.py index 3b6b15d..04746ac 100644..100755 --- a/warmachine.py +++ b/warmachine.py | |||
| @@ -1,10 +1,13 @@ | |||
| 1 | #!/usr/bin/env python | ||
| 2 | |||
| 1 | import socket | 3 | import socket |
| 2 | import sys | 4 | import sys |
| 3 | from actions.ActionMap import * | 5 | from actions.ActionMap import * |
| 4 | from passiveactions.PassiveActionMap import * | 6 | from passiveactions.PassiveActionMap import * |
| 5 | from conf.users import * | 7 | from conf.users import * |
| 6 | from wmd import parser | 8 | from wmd import parser |
| 7 | class irc: | 9 | |
| 10 | class IRC(object): | ||
| 8 | 11 | ||
| 9 | def __init__(self, server=None, nick=None, name=None, port=6667): | 12 | def __init__(self, server=None, nick=None, name=None, port=6667): |
| 10 | """ | 13 | """ |
| @@ -89,7 +92,7 @@ class irc: | |||
| 89 | print e | 92 | print e |
| 90 | 93 | ||
| 91 | if __name__ == '__main__': | 94 | if __name__ == '__main__': |
| 92 | i = irc('irc.inter.net.il', 'warmachine', 'omgident') | 95 | i = IRC('irc.freenode.org', 'warmachine', 'warmachine') |
| 93 | i.connect() | 96 | i.connect() |
| 94 | i.join('#zzq') | 97 | i.join('#antitech-dev') |
| 95 | i.MainLoop() | 98 | i.MainLoop() |