diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2290056..45d88ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Set up Python 2.7 - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.1.1 with: python-version: 2.7 @@ -46,7 +46,7 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.0 + - uses: actions/setup-node@v2.1.1 with: node-version: '12.x' @@ -76,7 +76,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Set up Python 2.7 - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.1.1 with: python-version: 2.7 @@ -97,7 +97,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Set up Python 2.7 - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.1.1 with: python-version: 2.7 diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 5655a53..3448b95 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -4,8 +4,11 @@ name: Upload Python Package on: - release: - types: [created] + push: + # Sequence of patterns matched against refs/tags + tags: + - '1.*' + - '2.*' jobs: deploy: @@ -15,7 +18,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Set up Python 2.7 - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.1.1 with: python-version: 2.7 diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 589cdc0..f46352c 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Set up Python 2.7 - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.1.1 with: python-version: 2.7 diff --git a/.github/workflows/pythonlint.yml b/.github/workflows/pythonlint.yml index ebc8487..5c353db 100644 --- a/.github/workflows/pythonlint.yml +++ b/.github/workflows/pythonlint.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Set up Python 2.7 - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.1.1 with: python-version: 2.7 diff --git a/.github/workflows/pythonsetup.yml b/.github/workflows/pythonsetup.yml index ca17bec..a3c5697 100644 --- a/.github/workflows/pythonsetup.yml +++ b/.github/workflows/pythonsetup.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python 2.7 - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.1.1 with: python-version: 2.7 diff --git a/CHANGELOG.md b/CHANGELOG.md index f9454c3..cde0c46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/SpunkyBot/spunkybot/compare/1.12.1...develop) +## [Unreleased](https://github.com/SpunkyBot/spunkybot/compare/1.12.2...develop) -## [1.12.1](https://github.com/SpunkyBot/spunkybot/compare/1.11.0...1.12.0) - 2020-07-17 +## [1.12.2](https://github.com/SpunkyBot/spunkybot/compare/1.12.0...1.12.2) - 2020-07-24 ### Fixed diff --git a/VERSION b/VERSION index f8f4f03..6b89d58 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.12.1 +1.12.2 diff --git a/debian/changelog b/debian/changelog index 1d37edb..f11dbd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -spunkybot (1.12.1-1) unstable; urgency=medium +spunkybot (1.12.2-1) unstable; urgency=medium * New upstream release. - Full changelog on https://github.com/spunkybot/spunkybot/releases - -- Spunky Bot Release Manager Fri, 17 Jul 2020 18:56:14 +0200 + -- Spunky Bot Release Manager Fri, 24 Jul 2020 17:31:08 +0200 spunkybot (1.12.0-1) unstable; urgency=medium diff --git a/doc/Commands.md b/doc/Commands.md index 2407e0d..8824345 100644 --- a/doc/Commands.md +++ b/doc/Commands.md @@ -112,7 +112,7 @@ * Short: `!alias ` * **bigtext** - display big message on screen * Usage: `!bigtext ` -* **exit** - display last disconnected player +* **exit** - display last disconnected player of this match * Usage: `!exit` * **find** - display the slot number of a player * Usage: `!find ` diff --git a/spunky.py b/spunky.py index 5d4d6bb..3d66b09 100644 --- a/spunky.py +++ b/spunky.py @@ -18,11 +18,12 @@ Modify the UrT server config as follows: * seta g_logsync "1" * seta g_loghits "1" + * seta g_friendlyfire "2" Modify the files '/conf/settings.conf' and '/conf/rules.conf' Run the bot: python spunky.py """ -__version__ = '1.12.1' +__version__ = '1.12.2' ### IMPORTS @@ -1870,8 +1871,9 @@ def handle_say(self, line): else: self.game.rcon_tell(sar['player_num'], COMMANDS['tell']['syntax']) + # exit - display last disconnected player of this match elif sar['command'] == '!exit' and self.game.players[sar['player_num']].get_admin_role() >= COMMANDS['exit']['level']: - msg = "^3Last disconnected player: ^7%s" % self.last_disconnected_player.get_name() if self.last_disconnected_player else "^3No player left during this match" + msg = "^7Last disconnected player: ^3%s" % self.last_disconnected_player.get_name() if self.last_disconnected_player else "^3No player left during this match" self.game.rcon_tell(sar['player_num'], msg) # find - display the slot number of the player @@ -4061,6 +4063,10 @@ def set_current_map(self): if self.dynamic_mapcycle: self.maplist = filter(None, (self.small_cycle if self.get_number_players() < self.switch_count else self.big_cycle)) logger.debug("Players online: %s / Mapcycle: %s", self.get_number_players(), self.maplist) + self.send_rcon("g_mapcycle dynamic.fake") + else: + if self.get_cvar('g_mapcycle') == "dynamic.fake": + self.send_rcon("g_mapcycle mapcycle.txt") if self.maplist: if self.mapname in self.maplist: