summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDipesh Amin <yaypunkrock@gmail.com>2011-08-25 23:37:45 +0100
committerDipesh Amin <yaypunkrock@gmail.com>2011-08-25 23:37:45 +0100
commit182c9f5454157f09d8ea0ce4e24561f1e2060038 (patch)
tree72716161503d344441962186aa7ba79ec18094dc
parentad09c60c5f4668051331ff6db0203406a8118dc8 (diff)
downloadmanamarket-182c9f5454157f09d8ea0ce4e24561f1e2060038.tar.gz
manamarket-182c9f5454157f09d8ea0ce4e24561f1e2060038.tar.bz2
manamarket-182c9f5454157f09d8ea0ce4e24561f1e2060038.tar.xz
manamarket-182c9f5454157f09d8ea0ce4e24561f1e2060038.zip
Add a specific message for when a user adds money to a !add request.
-rwxr-xr-xmain.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/main.py b/main.py
index 7799086..124f433 100755
--- a/main.py
+++ b/main.py
@@ -843,8 +843,11 @@ def main():
if amount == trader_state.item.amount and item_id == trader_state.item.id:
trader_state.complete = 1
mapserv.sendall(str(PacketOut(CMSG_TRADE_OK)))
+ elif item_id == 0 and amount > 0:
+ mapserv.sendall(whisper(trader_state.item.player, "Why are you adding money?!?!"))
+ mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
else:
- mapserv.sendall(whisper(trader_state.item.player, "Thats not the right item."))
+ mapserv.sendall(whisper(trader_state.item.player, "That's not the right item."))
mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST)))
elif trader_state.item.get == 0: # buy
@@ -954,6 +957,7 @@ def main():
pass
# On Disconnect/Exit
+ logging.info("Server disconnect.")
shop_broadcaster.stop()
mapserv.close()