summaryrefslogtreecommitdiff
path: root/main.py
diff options
context:
space:
mode:
authorDipesh Amin <yaypunkrock@gmail.com>2011-08-22 15:05:41 +0100
committerDipesh Amin <yaypunkrock@gmail.com>2011-08-22 15:05:41 +0100
commitcd9ac58f45f5e29b99917269f48eb7098aee7e6f (patch)
treee9ac5e9e42c405d2cc31a08bd7535e3a09f8e61e /main.py
parent81d0ec4e7199e0329a9c449f76bc3847dde20d5b (diff)
downloadmanamarket-cd9ac58f45f5e29b99917269f48eb7098aee7e6f.tar.gz
manamarket-cd9ac58f45f5e29b99917269f48eb7098aee7e6f.tar.bz2
manamarket-cd9ac58f45f5e29b99917269f48eb7098aee7e6f.tar.xz
manamarket-cd9ac58f45f5e29b99917269f48eb7098aee7e6f.zip
More cleanup.
Diffstat (limited to 'main.py')
-rwxr-xr-xmain.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/main.py b/main.py
index 42f5e5b..db30be3 100755
--- a/main.py
+++ b/main.py
@@ -6,13 +6,6 @@
tradey, a package, which implements an Automated Market Bot for "The Mana World" a 2D MMORPG.
- - Currently permissions are defined as: -1 (blocked), 0 (normal user), 5 (seller), 20 (admin).
- - An item will only be listed for a period of one week, and can be relisted
- for 3 weeks.
- - If a Trade in uncompleted within 5 minutes of a Trade Request, it is cancelled
- to prevent any disruptions to service.
- - The Bot supports the manaplus "right click and buy" feature; if an item is listed
- twice for the same price, the first shown in the list will be bought (i.e. the one added earlier).
"""
import logging
@@ -21,15 +14,13 @@ import sys
import time
import string
-
-
-from being import *
try:
import config
except:
print "no config file found. please move config.py.template to config.py and edit to your needs!"
exit(0);
+from being import *
from net.packet import *
from net.protocol import *
from net.packet_out import *
@@ -680,8 +671,7 @@ def main():
nick = packet.read_string(24)
message = packet.read_raw_string(msg_len)
logging.info("Whisper: " + nick + ": " + message)
- if nick != "guild":
- process_whisper(nick, utils.remove_colors(message), mapserv)
+ process_whisper(nick, utils.remove_colors(message), mapserv)
elif packet.is_type(SMSG_PLAYER_STAT_UPDATE_1):
stat_type = packet.read_int16()