Merge branch 'release-1.8'

README.md

@@ -9,7 +9,7 @@ The code of Spunky Bot is inspired by the eb2k9 bot by Shawn Haggard, which was
 
 [![Build Status](https://travis-ci.org/SpunkyBot/spunkybot.png?branch=master)](https://travis-ci.org/SpunkyBot/spunkybot)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/SpunkyBot/spunkybot/blob/master/LICENSE)
-![Version](https://img.shields.io/badge/version-1.7.0-orange.svg)
+![Version](https://img.shields.io/badge/version-1.8.0-orange.svg)
 [![PyPI version](https://img.shields.io/pypi/v/spunkybot.svg)](https://pypi.python.org/pypi/spunkybot)
 [![Code Health](https://landscape.io/github/SpunkyBot/spunkybot/master/landscape.svg)](https://landscape.io/github/SpunkyBot/spunkybot/master)
 
@@ -32,7 +32,7 @@ If you want to know more, this is a list of selected starting points:
 
 
 ## Environment
-- Urban Terror 4.1.1 / 4.2.023 / 4.3.0
+- Urban Terror 4.1.1 / 4.2.023 / 4.3.1
 - Python 2.6 / 2.7
 - SQLite 3 database
 - Cross-platform (tested on Debian 6 / 7 / 8, Ubuntu 12 / 14 / 16, CentOS 6 / 7, Mac OS X 10.12, Windows 7 / 10)

conf/rules.conf

@@ -2,4 +2,6 @@ Spotted a cheater? Send a demo to our admin
 Rule #1: ^7Use ^6Auto-join
 Rule #2: No racism of any kind
 Rule #3: ^5Don't be a ^3douchebag
-Powered by ^7Spunky Bot
+Powered by ^7Spunky Bot
+@admins
+@nextmap

doc/Commands.md

@@ -122,6 +122,15 @@
 
 ### Full Admin [60]
 
+- **ban** - ban a player for 7 days
+ - Usage: `!ban <name> <reason>`
+- **baninfo** - display active bans of a player
+ - Usage: `!baninfo <name>`
+ - Short: `!bi <name>`
+- **ci** - kick player with connection interrupt
+ - Usage: `!ci <name>`
+- **rain** - enables or disables rain
+ - Usage: `!rain <on/off>`
 - **scream** - scream a message in different colors to all players
  - Usage: `!scream <text>`
 - **slap** - slap a player (a number of times)
@@ -134,19 +143,16 @@
  - Usage: `!version`
 - **veto** - stop voting process
  - Usage: `!veto`
-- **ci** - kick player with connection interrupt
- - Usage: `!ci <name>`
-- **ban** - ban a player for 7 days
- - Usage: `!ban <name> <reason>`
-- **baninfo** - display active bans of a player
- - Usage: `!baninfo <name>`
- - Short: `!bi <name>`
 
 
 ### Senior Admin [80]
 
 - **banlist** - display the last active 10 bans
  - Usage: `!banlist`
+- **cyclemap** - start next map in rotation
+ - Usage: `!cyclemap`
+- **exec** - execute given config file
+ - Usage: `!exec <filename>`
 - **kiss** - clear all player warnings
  - Usage: `!kiss`
 - **kill** - kill a player
@@ -168,26 +174,29 @@
  - Usage: `!maprestart`
 - **moon** - activate Moon mode (low gravity)
  - Usage: `!moon <on/off>`
-- **cyclemap** - start next map in rotation
- - Usage: `!cyclemap`
-- **setnextmap** - set the given map as nextmap
- - Usage: `!setnextmap <ut4_name>`
-- **swapteams** - swap the current teams
- - Usage: `!swapteams`
 - **permban** - ban a player permanent
  - Usage: `!permban <name> <reason>`
  - Short: `!pb <name> <reason>`
 - **putgroup** - add a client to a group
  - Usage: `!putgroup <name> <group>`
  - Available Groups: _user_, _regular_, _mod_, _admin_, _fulladmin_
+- **setnextmap** - set the given map as nextmap
+ - Usage: `!setnextmap <ut4_name>`
+- **swapteams** - swap the current teams
+ - Usage: `!swapteams`
 - **unban** - unban a player from the database
  - Usage: `!unban <ID>`
 
 
 ### Head Admin [100]
 
+- **password** - set private server password
+ - Usage: `!password [<password>]`
+ - Set an empty string to remove a password
 - **putgroup** - add a client to a group
  - Usage: `!putgroup <name> <group>`
  - Available Groups: _user_, _regular_, _mod_, _admin_, _fulladmin_, _senioradmin_
+- **reload** - reload map
+ - Usage: `!reload`
 - **ungroup** - remove admin level from a player
  - Usage: `!ungroup <name>`