Merge remote branch 'origin/irc' into v3.0-devel

greghaynes · Apr 19, 2010 · 3384658 · 3384658
2 parents f42284e + 315a4c3
commit 3384658
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 44 deletions.
diff --git a/src/pyscripts/Config/ircbot.conf b/src/pyscripts/Config/ircbot.conf
diff --git a/src/pyscripts/plugins/ircbot.py b/src/pyscripts/plugins/ircbot.py
@@ -40,7 +40,9 @@
 		'unspectated': 'yes',
 		'kicked': 'yes',
 		'mastermode_changed': 'yes',
-		'clearbans': 'yes'
+		'clearbans': 'yes',
+		'banned': 'yes',
+		'teamkill': 'yes'
 		},
 	'Alerts': {
 		'player_connect': 'yes',
@@ -57,7 +59,9 @@
 		'unspectated': 'yes',
 		'kicked': 'yes',
 		'mastermode_changed': 'yes',
-		'clearbans': 'yes'
+		'clearbans': 'yes',
+		'banned': 'yes',
+		'teamkill': 'yes'
 		},
 	'Templates': {
 		'irc_message': '${grey}${channel} ${blue}${name}${white}: ${message}',
@@ -66,17 +70,19 @@
 		'player_connect': '${teal}Connected: ${orange}${name}${default} (${brown}${cn}${default}) from ${green}${country}',
 		'player_disconnect': '${teal}Disconnected: ${orange}${name}${default}',
 		'message': '${orange}${name}: ${default}${message}',
-		'map_change': '${teal}Map: ${green}${map} (${brown}${mode}${default})',
+		'map_change': '${teal}Map: ${green}${map}${default} (${brown}${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 ${brown}${authname}@sauerbraten.org',
 		'relinquish_admin': '${orange}${name}${default} has relinquished ${brown}admin',
 		'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 ${red}kicked/banned',
-		'mastermode_changed': '${teal}Mastermode${default} is now ${brown}${mode} (${mm})',
-		'clearbans': 'Temporary ${red}bans${default} cleared.'
+		'kicked': '${orange}${name}${default} has been ${red}kicked/banned',
+		'mastermode_changed': '${teal}Mastermode${default} is now ${brown}${mode}${default} (${mm}${default})',
+		'clearbans': 'Temporary ${red}bans${default} cleared.',
+		'banned': '${orange}${name}${default} (${brown}${cn}${default}) has been ${red}banned${default} for ${seconds} seconds for ${red}${reason}',
+		'teamkill': '${orange}${name} ${red}teamkilled ${orange}${victim}'
 		}
 	}
 
@@ -87,15 +93,15 @@
 		'green': '\x033',
 		'red': '\x034',
 		'brown': '\x035',
-		'purple': '\x036',
+		'magenta': '\x036',
 		'orange': '\x037',
 		'yellow': '\x038',
 		'lime': '\x039',
 		'teal': '\x0310',
 		'cyan': '\x0311',
 		'lightblue': '\x0312',
 		'pink': '\x0313',
-		'gray': '\x0314',
+		'grey': '\x0314',
 		'silver': '\x0315',
 		'default': '\x03'
 	}
@@ -169,7 +175,9 @@ def dotemplate(ability, **args):
 	'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, mode=masterModeName(mm))),
-	'clearbans': ('server_clear_bans', lambda cn: dotemplate('clearbans', name=sbserver.playerName(cn), cn=cn))
+	'clearbans': ('server_clear_bans', lambda cn: dotemplate('clearbans', name=sbserver.playerName(cn), cn=cn)),
+	'banned': ('player_banned', lambda cn, seconds, reason: dotemplate('banned', name=sbserver.playerName(cn), cn=cn, seconds=seconds, reason=reason)),
+	'teamkill': ('player_teamkill', lambda cn, victim: dotemplate('teamkill', name=sbserver.playerName(cn), cn=cn, victim=sbserver.playerName(victim), victimcn=victim))
 }
 
 factory = IrcBotFactory(config['Connection']['nickname'], [config['Connection']['channel']])

diff --git a/src/pyscripts/xsbs/ban.py b/src/pyscripts/xsbs/ban.py
@@ -94,5 +94,5 @@ def ban(cn, seconds, reason, banner_cn, sticky=False):
 		reason,
 		banner_nick,
 		ipLongToString(banner_ip))
-	sbserver.message(info(config['Main']['message'].substitute(colordict, name=nick, seconds=seconds, reason=reason)))
+	sbserver.message(info(string.Template(config['Main']['message']).substitute(colordict, name=nick, seconds=seconds, reason=reason)))