From 94c12541ef0cdbff5c935894a90bee5bd77c9106 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 10 Jan 2021 10:46:17 +0100 Subject: [PATCH] Happy new year! --- COPYING | 4 ++-- docs/conf.py | 9 ++++++--- main.py | 2 +- setup.py | 2 +- squirrelbattle/__init__.py | 2 +- squirrelbattle/bootstrap.py | 2 +- squirrelbattle/display/__init__.py | 2 +- squirrelbattle/display/creditsdisplay.py | 2 +- squirrelbattle/display/display.py | 2 +- squirrelbattle/display/display_manager.py | 2 +- squirrelbattle/display/logsdisplay.py | 2 +- squirrelbattle/display/mapdisplay.py | 2 +- squirrelbattle/display/menudisplay.py | 2 +- squirrelbattle/display/messagedisplay.py | 2 +- squirrelbattle/display/statsdisplay.py | 2 +- squirrelbattle/display/texturepack.py | 2 +- squirrelbattle/entities/__init__.py | 2 +- squirrelbattle/entities/items.py | 2 +- squirrelbattle/entities/monsters.py | 2 +- squirrelbattle/entities/player.py | 2 +- squirrelbattle/enums.py | 2 +- squirrelbattle/game.py | 2 +- squirrelbattle/interfaces.py | 2 +- squirrelbattle/menus.py | 2 +- squirrelbattle/resources.py | 2 +- squirrelbattle/settings.py | 2 +- squirrelbattle/term_manager.py | 2 +- squirrelbattle/tests/__init__.py | 2 +- squirrelbattle/tests/entities_test.py | 2 +- squirrelbattle/tests/game_test.py | 2 +- squirrelbattle/tests/interfaces_test.py | 2 +- squirrelbattle/tests/screen.py | 2 +- squirrelbattle/tests/settings_test.py | 2 +- squirrelbattle/translations.py | 2 +- 34 files changed, 40 insertions(+), 37 deletions(-) diff --git a/COPYING b/COPYING index 1bc08a5..ce2c363 100644 --- a/COPYING +++ b/COPYING @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Squirrel Battle - Copyright (C) 2020 ÿnérant, eichhornchen, nicomarg, charlse + Copyright (C) 2020-2021 ÿnérant, eichhornchen, nicomarg, charlse This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Squirrel Battle Copyright (C) 2020 ÿnérant, eichhornchen, nicomarg, charlse + Squirrel Battle Copyright (C) 2020-2021 ÿnérant, eichhornchen, nicomarg, charlse This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/docs/conf.py b/docs/conf.py index 4877d19..0d65dd0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,8 +18,11 @@ # -- Project information ----------------------------------------------------- project = 'Squirrel Battle' -copyright = "2020" -author = "Yohann D'ANELLO,\nMathilde DEPRES,\nNicolas MARGULIES,\nCharles PEYRAT" +copyright = "2020-2021" +author = "Yohann D'ANELLO,\n" \ + "Mathilde DEPRES,\n" \ + "Nicolas MARGULIES,\n" \ + "Charles PEYRAT" # -- General configuration --------------------------------------------------- @@ -57,4 +60,4 @@ html_theme = 'sphinx_rtd_theme' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] \ No newline at end of file +html_static_path = ['_static'] diff --git a/main.py b/main.py index fbbbb35..2f6579a 100755 --- a/main.py +++ b/main.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import argparse import sys diff --git a/setup.py b/setup.py index 7f39d83..5a2a5e7 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import subprocess diff --git a/squirrelbattle/__init__.py b/squirrelbattle/__init__.py index 1cc6688..7c508cd 100644 --- a/squirrelbattle/__init__.py +++ b/squirrelbattle/__init__.py @@ -1,2 +1,2 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/squirrelbattle/bootstrap.py b/squirrelbattle/bootstrap.py index f041aef..543fe01 100644 --- a/squirrelbattle/bootstrap.py +++ b/squirrelbattle/bootstrap.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from squirrelbattle.game import Game diff --git a/squirrelbattle/display/__init__.py b/squirrelbattle/display/__init__.py index 1cc6688..7c508cd 100644 --- a/squirrelbattle/display/__init__.py +++ b/squirrelbattle/display/__init__.py @@ -1,2 +1,2 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/squirrelbattle/display/creditsdisplay.py b/squirrelbattle/display/creditsdisplay.py index 93f2f72..e005c5b 100644 --- a/squirrelbattle/display/creditsdisplay.py +++ b/squirrelbattle/display/creditsdisplay.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import curses diff --git a/squirrelbattle/display/display.py b/squirrelbattle/display/display.py index 55e23a8..9b6e97c 100644 --- a/squirrelbattle/display/display.py +++ b/squirrelbattle/display/display.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import curses diff --git a/squirrelbattle/display/display_manager.py b/squirrelbattle/display/display_manager.py index b4153c9..f1b879f 100644 --- a/squirrelbattle/display/display_manager.py +++ b/squirrelbattle/display/display_manager.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import curses diff --git a/squirrelbattle/display/logsdisplay.py b/squirrelbattle/display/logsdisplay.py index 5c30b41..1c323af 100644 --- a/squirrelbattle/display/logsdisplay.py +++ b/squirrelbattle/display/logsdisplay.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from squirrelbattle.display.display import Display diff --git a/squirrelbattle/display/mapdisplay.py b/squirrelbattle/display/mapdisplay.py index 701f33e..2439489 100644 --- a/squirrelbattle/display/mapdisplay.py +++ b/squirrelbattle/display/mapdisplay.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from squirrelbattle.interfaces import Map diff --git a/squirrelbattle/display/menudisplay.py b/squirrelbattle/display/menudisplay.py index 64d69b7..628961f 100644 --- a/squirrelbattle/display/menudisplay.py +++ b/squirrelbattle/display/menudisplay.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import curses diff --git a/squirrelbattle/display/messagedisplay.py b/squirrelbattle/display/messagedisplay.py index d850500..2b1ec30 100644 --- a/squirrelbattle/display/messagedisplay.py +++ b/squirrelbattle/display/messagedisplay.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import curses diff --git a/squirrelbattle/display/statsdisplay.py b/squirrelbattle/display/statsdisplay.py index a60f6a2..e8a151a 100644 --- a/squirrelbattle/display/statsdisplay.py +++ b/squirrelbattle/display/statsdisplay.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import curses diff --git a/squirrelbattle/display/texturepack.py b/squirrelbattle/display/texturepack.py index d5c6da1..f124523 100644 --- a/squirrelbattle/display/texturepack.py +++ b/squirrelbattle/display/texturepack.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import curses diff --git a/squirrelbattle/entities/__init__.py b/squirrelbattle/entities/__init__.py index 1cc6688..7c508cd 100644 --- a/squirrelbattle/entities/__init__.py +++ b/squirrelbattle/entities/__init__.py @@ -1,2 +1,2 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/squirrelbattle/entities/items.py b/squirrelbattle/entities/items.py index c231b53..c79a350 100644 --- a/squirrelbattle/entities/items.py +++ b/squirrelbattle/entities/items.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from random import choice, randint diff --git a/squirrelbattle/entities/monsters.py b/squirrelbattle/entities/monsters.py index b62421a..c654428 100644 --- a/squirrelbattle/entities/monsters.py +++ b/squirrelbattle/entities/monsters.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from random import shuffle diff --git a/squirrelbattle/entities/player.py b/squirrelbattle/entities/player.py index 615dfd5..8257f85 100644 --- a/squirrelbattle/entities/player.py +++ b/squirrelbattle/entities/player.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from random import randint diff --git a/squirrelbattle/enums.py b/squirrelbattle/enums.py index f39a57f..808960c 100644 --- a/squirrelbattle/enums.py +++ b/squirrelbattle/enums.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from enum import Enum, auto diff --git a/squirrelbattle/game.py b/squirrelbattle/game.py index 9734144..580b660 100644 --- a/squirrelbattle/game.py +++ b/squirrelbattle/game.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from json import JSONDecodeError diff --git a/squirrelbattle/interfaces.py b/squirrelbattle/interfaces.py index 8117659..95e2628 100644 --- a/squirrelbattle/interfaces.py +++ b/squirrelbattle/interfaces.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from enum import Enum, auto diff --git a/squirrelbattle/menus.py b/squirrelbattle/menus.py index 92ead1c..8de9547 100644 --- a/squirrelbattle/menus.py +++ b/squirrelbattle/menus.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from enum import Enum diff --git a/squirrelbattle/resources.py b/squirrelbattle/resources.py index b3421db..55facca 100644 --- a/squirrelbattle/resources.py +++ b/squirrelbattle/resources.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from pathlib import Path diff --git a/squirrelbattle/settings.py b/squirrelbattle/settings.py index 6f7cf57..92a8b37 100644 --- a/squirrelbattle/settings.py +++ b/squirrelbattle/settings.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import json diff --git a/squirrelbattle/term_manager.py b/squirrelbattle/term_manager.py index 2e74fff..cd028b5 100644 --- a/squirrelbattle/term_manager.py +++ b/squirrelbattle/term_manager.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import curses diff --git a/squirrelbattle/tests/__init__.py b/squirrelbattle/tests/__init__.py index 1cc6688..7c508cd 100644 --- a/squirrelbattle/tests/__init__.py +++ b/squirrelbattle/tests/__init__.py @@ -1,2 +1,2 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/squirrelbattle/tests/entities_test.py b/squirrelbattle/tests/entities_test.py index 5729032..231bd13 100644 --- a/squirrelbattle/tests/entities_test.py +++ b/squirrelbattle/tests/entities_test.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import random import unittest diff --git a/squirrelbattle/tests/game_test.py b/squirrelbattle/tests/game_test.py index 11dd376..f6407ad 100644 --- a/squirrelbattle/tests/game_test.py +++ b/squirrelbattle/tests/game_test.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import curses diff --git a/squirrelbattle/tests/interfaces_test.py b/squirrelbattle/tests/interfaces_test.py index df1cbea..77ae53a 100644 --- a/squirrelbattle/tests/interfaces_test.py +++ b/squirrelbattle/tests/interfaces_test.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import unittest diff --git a/squirrelbattle/tests/screen.py b/squirrelbattle/tests/screen.py index 57b7dcc..03ae206 100644 --- a/squirrelbattle/tests/screen.py +++ b/squirrelbattle/tests/screen.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later from typing import Tuple diff --git a/squirrelbattle/tests/settings_test.py b/squirrelbattle/tests/settings_test.py index 65cb25a..c6d696c 100644 --- a/squirrelbattle/tests/settings_test.py +++ b/squirrelbattle/tests/settings_test.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import unittest diff --git a/squirrelbattle/translations.py b/squirrelbattle/translations.py index df140a2..b4cddfc 100644 --- a/squirrelbattle/translations.py +++ b/squirrelbattle/translations.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse +# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse # SPDX-License-Identifier: GPL-3.0-or-later import gettext as gt