From 03766f374c89f8120c3256340945ca9231bf87af Mon Sep 17 00:00:00 2001 From: Alexander Kress Date: Fri, 17 Jul 2020 20:02:34 +0200 Subject: [PATCH 01/10] =?UTF-8?q?=C2=96Set=20version=20to=20development=20?= =?UTF-8?q?version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spunky.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spunky.py b/spunky.py index 5d4d6bb..66f7c8b 100644 --- a/spunky.py +++ b/spunky.py @@ -22,7 +22,7 @@ Run the bot: python spunky.py """ -__version__ = '1.12.1' +__version__ = '1.13.0.dev0' ### IMPORTS From bf23bedb84cd4a39b42e97d05706f564aea375fb Mon Sep 17 00:00:00 2001 From: Alexander Kress Date: Fri, 17 Jul 2020 20:05:55 +0200 Subject: [PATCH 02/10] Compare 1.12.0 with 1.12.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9454c3..ebbda28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/SpunkyBot/spunkybot/compare/1.12.1...develop) -## [1.12.1](https://github.com/SpunkyBot/spunkybot/compare/1.11.0...1.12.0) - 2020-07-17 +## [1.12.1](https://github.com/SpunkyBot/spunkybot/compare/1.12.0...1.12.1) - 2020-07-17 ### Fixed From 69e50194a6202358cf3e140c978003419bb7ca4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2020 06:07:16 +0000 Subject: [PATCH 03/10] Bump actions/setup-python from v2 to v2.1.1 Bumps [actions/setup-python](https://github.com/actions/setup-python) from v2 to v2.1.1. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...0c28554988f6ccf1a4e2818e703679796e41a214) Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 6 +++--- .github/workflows/pypi-publish.yml | 2 +- .github/workflows/pytest.yml | 2 +- .github/workflows/pythonlint.yml | 2 +- .github/workflows/pythonsetup.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2290056..0b30f48 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 @@ -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..7e42c59 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -15,7 +15,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 From 58f69889c7a4f2cd60184a988fef9ef08473fd8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jul 2020 06:14:26 +0000 Subject: [PATCH 04/10] Bump actions/setup-node from v2.1.0 to v2.1.1 Bumps [actions/setup-node](https://github.com/actions/setup-node) from v2.1.0 to v2.1.1. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.1.0...321b6ccb03083caa2ad22b27dc4b45335212e824) Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2290056..26edd4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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' From 80b9caf1f017de0f47181c57e70067f6fc6bfbef Mon Sep 17 00:00:00 2001 From: Alexander Kress Date: Fri, 24 Jul 2020 17:18:23 +0200 Subject: [PATCH 05/10] Change from 'release created' to push on tag --- .github/workflows/pypi-publish.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 5655a53..7dbc9ec 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: From 4c34d9cb7ae7ced492a6b98ae5a887ae8bc9d287 Mon Sep 17 00:00:00 2001 From: Alexander Kress Date: Fri, 24 Jul 2020 17:20:02 +0200 Subject: [PATCH 06/10] Add additional comment/hint for command !exit --- doc/Commands.md | 2 +- spunky.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 66f7c8b..fcd2be6 100644 --- a/spunky.py +++ b/spunky.py @@ -1870,8 +1870,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 From 8bd4be76353d1b2ba347a8ef42fc04d929bae219 Mon Sep 17 00:00:00 2001 From: Alexander Kress Date: Fri, 24 Jul 2020 17:21:09 +0200 Subject: [PATCH 07/10] Add comment how to set friendlyfire --- spunky.py | 1 + 1 file changed, 1 insertion(+) diff --git a/spunky.py b/spunky.py index fcd2be6..85e5bb1 100644 --- a/spunky.py +++ b/spunky.py @@ -18,6 +18,7 @@ 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 """ From efacd40ff5ffb3e3e6fe5754c9af93ced6322705 Mon Sep 17 00:00:00 2001 From: Alexander Kress Date: Fri, 24 Jul 2020 17:25:11 +0200 Subject: [PATCH 08/10] Fixed #61 and fixed #86: ignore mapcycle.txt when using dynamic mapcycle --- spunky.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spunky.py b/spunky.py index 85e5bb1..3e80cbf 100644 --- a/spunky.py +++ b/spunky.py @@ -4063,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: From 34e15aef264b829dd05c92676ccae9f116c00853 Mon Sep 17 00:00:00 2001 From: Alexander Kress Date: Fri, 24 Jul 2020 17:31:09 +0200 Subject: [PATCH 09/10] Bumped version number to 1.12.2 --- CHANGELOG.md | 2 +- VERSION | 2 +- debian/changelog | 6 ++++++ spunky.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebbda28..c5d7fe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ 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.12.0...1.12.1) - 2020-07-17 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..d6ce879 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spunkybot (1.12.2-1) unstable; urgency=medium + + * New upstream release. + + -- Spunky Bot Release Manager Fri, 24 Jul 2020 17:31:08 +0200 + spunkybot (1.12.1-1) unstable; urgency=medium * New upstream release. diff --git a/spunky.py b/spunky.py index 3e80cbf..3d66b09 100644 --- a/spunky.py +++ b/spunky.py @@ -23,7 +23,7 @@ Run the bot: python spunky.py """ -__version__ = '1.13.0.dev0' +__version__ = '1.12.2' ### IMPORTS From ad30ef3095f11709c6e5ebe1246709bf1413dfbc Mon Sep 17 00:00:00 2001 From: Alexander Kress Date: Fri, 24 Jul 2020 17:36:27 +0200 Subject: [PATCH 10/10] Updated CHANGELOG for release 1.12.2 --- CHANGELOG.md | 2 +- debian/changelog | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5d7fe0..cde0c46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/SpunkyBot/spunkybot/compare/1.12.2...develop) -## [1.12.1](https://github.com/SpunkyBot/spunkybot/compare/1.12.0...1.12.1) - 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/debian/changelog b/debian/changelog index d6ce879..f11dbd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,9 @@ spunkybot (1.12.2-1) unstable; urgency=medium - * New upstream release. - - -- Spunky Bot Release Manager Fri, 24 Jul 2020 17:31:08 +0200 - -spunkybot (1.12.1-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