Report player deaths
This commit is contained in:
@@ -36,6 +36,11 @@ class BroadcastEvent(Event):
|
||||
super(BroadcastEvent, self).__init__(type='broadcast', data={'message':
|
||||
message})
|
||||
|
||||
class PlayerDeathEvent(Event):
|
||||
def __init__(self, player, message):
|
||||
super(PlayerDeathEvent, self).__init__(type='player-death',
|
||||
data={'player': player, 'message': message})
|
||||
|
||||
class PlayerMessageEvent(Event):
|
||||
def __init__(self, user, message):
|
||||
super(PlayerMessageEvent, self).__init__(type='player-message',
|
||||
|
@@ -13,7 +13,7 @@ from urllib2 import urlopen
|
||||
import json
|
||||
from datetime import datetime
|
||||
from models import cachePlayerList
|
||||
from events import server_queue, web_queue, chat, server_broadcast, send_web_event, QuitEvent, JoinEvent
|
||||
from events import server_queue, web_queue, chat, server_broadcast, send_web_event, QuitEvent, JoinEvent, PlayerDeathEvent
|
||||
|
||||
class MOTDHandler(AnonymousBaseHandler):
|
||||
allowed_methods = ('GET',)
|
||||
@@ -107,6 +107,9 @@ class ServerEventHandler(BaseHandler):
|
||||
print repr(evt)
|
||||
if evt['type'] == 'chat':
|
||||
chat(evt['payload']['sender'], evt['payload']['message'])
|
||||
if evt['type'] == 'player-death':
|
||||
send_web_event(PlayerDeathEvent(evt['payload']['player'],
|
||||
evt['payload']['message']))
|
||||
return {'result': 'success'}
|
||||
|
||||
class ChatHandler(BaseHandler):
|
||||
|
@@ -12,6 +12,8 @@ function pollMessages(id) {
|
||||
$('#chat-display').append("<li><em>"+evt['payload']['player']+" has quit</em></li>");
|
||||
} else if (evt['type'] == 'broadcast') {
|
||||
$('#chat-display').append("<li><strong>"+evt['payload']['message']+"</strong></li>");
|
||||
} else if (evt['type'] == 'player-death') {
|
||||
$('#chat-display').append("<li><em>"+evt['payload']['player']+" died.</em></li>");
|
||||
}
|
||||
});
|
||||
window.setTimeout(function() {pollMessages(data['poll-id'])}, 1);
|
||||
|
Reference in New Issue
Block a user