Add more irc events

greghaynes · Mar 21, 2010 · abbefe3 · abbefe3
1 parent 658ee23
commit abbefe3
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/src/pyscripts/plugins/ircbot.py b/src/pyscripts/plugins/ircbot.py
@@ -35,7 +35,11 @@
 		'gain_master': 'yes',
 		'auth': 'yes',
 		'relinquish_master': 'yes',
-		'relinquish_admin': 'yes'
+		'relinquish_admin': 'yes',
+		'spectated': 'yes',
+		'unspectated': 'yes',
+		'kicked': 'yes',
+		'mastermode_changed': 'yes'
 		},
 	'Alerts': {
 		'player_connect': 'yes',
@@ -47,21 +51,29 @@
 		'gain_master': 'yes',
 		'auth': 'yes',
 		'relinquish_master': 'yes',
-		'relinquish_admin': 'yes'
+		'relinquish_admin': 'yes',
+		'spectated': 'yes',
+		'unspectated': 'yes',
+		'kicked': 'yes',
+		'mastermode_changed': 'yes'
 		},
 	'Templates': {
 		'irc_message': '${grey}${channel} ${blue}${name}${white}: ${message}',
 		'status_message': '${num_clients} clients on map ${map_name}',
 
-		'player_connect': '${teal}Connected: ${orange}${name}${default} (${cyan}${cn}${default}) from ${green}${country}',
+		'player_connect': '${teal}Connected: ${orange}${name}${default} (${blue}${cn}${default}) from ${green}${country}',
 		'player_disconnect': '${teal}Disconnected: ${orange}${name}${default}',
 		'message': '${orange}${name}${default}: ${message}',
-		'map_change': '${teal}Map: ${green}${map} (${cyan}${mode}${default})',
+		'map_change': '${teal}Map: ${green}${map} (${blue}${mode}${default})',
 		'gain_admin': '${orange}${name}${default} has claimed ${brown}admin',
 		'gain_master': '${orange}${name}${default} has claimed ${brown}master',
-		'auth': '${orange}${name}${default} has authenticated as ${cyan}${authname}@sauerbraten.org',
+		'auth': '${orange}${name}${default} has authenticated as ${brown}${authname}@sauerbraten.org',
 		'relinquish_admin': '${orange}${name}${default} has relinquished ${brown}admin',
-		'relinquish_master': '${orange}${name}${default} has relinquished ${brown}master'
+		'relinquish_master': '${orange}${name}${default} has relinquished ${brown}master',
+		'spectated': '${orange}${name}${default} is now a spectator',
+		'unspectated': '${orange}${name}${default} is no longer a spectator',
+		'kicked': '${orange}${name}$[default} has been kicked',
+		'mastermode_changed': 'mastermode is now ${blue}${mm}'
 		}
 	}
 
@@ -150,6 +162,10 @@ def dotemplate(ability, **args):
 	'auth': ('player_auth_succeed', lambda x, y: dotemplate('auth', name=sbserver.playerName(x), cn=x, authname=y)),
 	'relinquish_admin': ('player_released_admin', lambda x: dotemplate('relinquish_admin', name=sbserver.playerName(x), cn=x)),
 	'relinquish_master': ('player_released_master', lambda x: dotemplate('relinquish_master', name=sbserver.playerName(x), cn=x)),
+	'spectated': ('player_spectated', lambda cn: dotemplate('spectated', name=sbserver.playerName(cn), cn=cn)),
+	'unspectated': ('player_unspectated', lambda cn: dotemplate('unspectated', name=sbserver.playerName(cn), cn=cn)),
+	'kicked': ('player_kick', lambda cn, who: dotemplate('kicked', by=sbserver.playerName(cn), bycn=cn, name=sbserver.playerName(who), cn=who)),
+	'mastermode_changed': ('server_mastermode_changed', lambda mm: dotemplate('mastermode_changed', mm=mm))
 }
 
 factory = IrcBotFactory(config['Connection']['nickname'], [config['Connection']['channel']])