diff options
| -rw-r--r-- | README.rst | 3 | ||||
| -rw-r--r-- | brutalmaze/__init__.py | 2 | ||||
| -rw-r--r-- | brutalmaze/constants.py | 1 | ||||
| -rw-r--r-- | brutalmaze/game.py | 14 | ||||
| -rw-r--r-- | brutalmaze/settings.ini | 2 | ||||
| -rw-r--r-- | brutalmaze/soundfx/music.ogg | bin | 2431401 -> 0 bytes | |||
| -rwxr-xr-x | setup.py | 8 | ||||
| m--------- | wiki | 0 |
8 files changed, 10 insertions, 20 deletions
diff --git a/README.rst b/README.rst index eadb13b..33a0ff0 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,7 @@ Brutal Maze =========== -Brutal Maze is a third-person shooter game with fast-paced action and a -minimalist art style. +Brutal Maze is a thrilling shoot 'em up game with minimalist art style. .. image:: https://raw.githubusercontent.com/McSinyx/brutalmaze/master/screenshot.png :target: https://McSinyx.github.io/brutalmaze/ diff --git a/brutalmaze/__init__.py b/brutalmaze/__init__.py index 3e2e7a1..5b5144f 100644 --- a/brutalmaze/__init__.py +++ b/brutalmaze/__init__.py @@ -1 +1 @@ -"""Brutal Maze is a minimalist third-person shooter with fast-paced action""" +"""Brutal Maze is a minimalist thrilling shoot 'em up game.""" diff --git a/brutalmaze/constants.py b/brutalmaze/constants.py index a7d1267..24ad23a 100644 --- a/brutalmaze/constants.py +++ b/brutalmaze/constants.py @@ -27,7 +27,6 @@ from pygame.mixer import Sound SETTINGS = pkg_file('brutalmaze', 'settings.ini') ICON = pygame.image.load(pkg_file('brutalmaze', 'icon.png')) -MUSIC = pkg_file('brutalmaze', 'soundfx/music.ogg') NOISE = pkg_file('brutalmaze', 'soundfx/noise.ogg') mixer = pygame.mixer.get_init() diff --git a/brutalmaze/game.py b/brutalmaze/game.py index 94e2f08..65fcffb 100644 --- a/brutalmaze/game.py +++ b/brutalmaze/game.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with Brutal Maze. If not, see <https://www.gnu.org/licenses/>. -__version__ = '0.8.23' +__version__ = '0.8.24' import re from argparse import ArgumentParser, FileType, RawTextHelpFormatter @@ -36,7 +36,7 @@ from pygame import KEYDOWN, MOUSEBUTTONUP, QUIT, VIDEORESIZE from pygame.time import Clock, get_ticks from appdirs import AppDirs -from .constants import SETTINGS, ICON, MUSIC, NOISE, HERO_SPEED, MIDDLE +from .constants import SETTINGS, ICON, NOISE, HERO_SPEED, MIDDLE from .maze import Maze from .misc import sign, deg, join @@ -69,7 +69,6 @@ class ConfigReader: self.max_fps = self.config.getint('Graphics', 'Maximum FPS') self.muted = self.config.getboolean('Sound', 'Muted') self.musicvol = self.config.getfloat('Sound', 'Music volume') - self.space = self.config.getboolean('Sound', 'Space theme') self.touch = self.config.getboolean('Control', 'Touch') self.export_dir = self.config.get('Record', 'Directory') self.export_rate = self.config.getint('Record', 'Frequency') @@ -98,7 +97,7 @@ class ConfigReader: def read_args(self, arguments): """Read and parse a ArgumentParser.Namespace.""" - for option in ('size', 'max_fps', 'muted', 'musicvol', 'space', + for option in ('size', 'max_fps', 'muted', 'musicvol', 'touch', 'export_dir', 'export_rate', 'server', 'host', 'port', 'timeout', 'headless'): value = getattr(arguments, option) @@ -114,7 +113,7 @@ class Game: if config.muted or self.headless: pygame.mixer.quit() else: - pygame.mixer.music.load(NOISE if config.space else MUSIC) + pygame.mixer.music.load(NOISE) pygame.mixer.music.set_volume(config.musicvol) pygame.mixer.music.play(-1) pygame.display.set_icon(ICON) @@ -355,11 +354,6 @@ def main(): '--music-volume', type=float, metavar='VOL', dest='musicvol', help='between 0.0 and 1.0 (fallback: {})'.format(config.musicvol)) parser.add_argument( - '--space-music', action='store_true', dest='space', default=None, - help='use space music background (fallback: {})'.format(config.space)) - parser.add_argument('--default-music', action='store_false', dest='space', - help='use default music background') - parser.add_argument( '--touch', action='store_true', default=None, help='enable touch-friendly control (fallback: {})'.format( config.touch)) diff --git a/brutalmaze/settings.ini b/brutalmaze/settings.ini index e633a56..d78aed2 100644 --- a/brutalmaze/settings.ini +++ b/brutalmaze/settings.ini @@ -8,8 +8,6 @@ Maximum FPS: 60 Muted: no # Volume must be between 0.0 and 1.0. Music volume: 1.0 -# Use space music background, which sounds cold and creepy. -Space theme: no [Control] # Touch-friendly control diff --git a/brutalmaze/soundfx/music.ogg b/brutalmaze/soundfx/music.ogg deleted file mode 100644 index 163fa08..0000000 --- a/brutalmaze/soundfx/music.ogg +++ /dev/null Binary files differdiff --git a/setup.py b/setup.py index 2ffd2c0..ad9814a 100755 --- a/setup.py +++ b/setup.py @@ -7,13 +7,13 @@ with open('README.rst') as f: setup( name='brutalmaze', - version='0.8.23', - description='A minimalist TPS game with fast-paced action', + version='0.8.24', + description="Minimalist thrilling shoot 'em up game", long_description=long_description, url='https://github.com/McSinyx/brutalmaze', author='Nguyễn Gia Phong', author_email='vn.mcsinyx@gmail.com', - license='GPLv3+', + license='AGPLv3+', classifiers=[ 'Development Status :: 4 - Beta', 'Environment :: MacOS X', @@ -25,7 +25,7 @@ setup( 'Operating System :: OS Independent', 'Programming Language :: Python', 'Topic :: Games/Entertainment :: Arcade'], - keywords='pygame third-person-shooter arcade-game maze ai-challenges', + keywords='pygame shmup arcade-game maze ai-challenges', packages=['brutalmaze'], install_requires=['appdirs', 'pygame>=1.9'], package_data={'brutalmaze': ['icon.png', 'soundfx/*.ogg', 'settings.ini']}, diff --git a/wiki b/wiki -Subproject bbe35efbf6089f17fffb72612196f36b1256aea +Subproject 55bec877617541436935290adedb7760b115557 |