From d80cebfa2d2ded78d77a753cefdc2f3fb92754a2 Mon Sep 17 00:00:00 2001 From: Diogo Gomes Date: Tue, 15 Oct 2019 20:18:03 +0100 Subject: [PATCH] add 5 levels --- characters.py | 6 ++++++ game.py | 12 +++++++++++- viewer.py | 8 +++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/characters.py b/characters.py index cebab9e..291ef02 100644 --- a/characters.py +++ b/characters.py @@ -194,3 +194,9 @@ def __init__(self, pos): super().__init__( pos, self.__class__.__name__, 2000, Speed.SLOW, Smart.NORMAL, True ) + +class Pass(Enemy): + def __init__(self, pos): + super().__init__( + pos, self.__class__.__name__, 4000, Speed.FAST, Smart.HIGH, False + ) diff --git a/game.py b/game.py index 2393750..bf0b509 100644 --- a/game.py +++ b/game.py @@ -6,7 +6,7 @@ import requests -from characters import Balloom, Bomberman, Character, Doll, Minvo, Oneal, Kondoria, Ovapi +from characters import Balloom, Bomberman, Character, Doll, Minvo, Oneal, Kondoria, Ovapi, Pass from consts import Powerups from mapa import Map, Tiles @@ -31,6 +31,11 @@ 8: [Oneal] * 1 + [Doll] * 2 + [Minvo] * 4, 9: [Oneal] * 1 + [Doll] * 1 + [Minvo] * 4 + [Kondoria] * 1, 10: [Oneal] * 1 + [Doll] * 1 + [Minvo] * 1 + [Kondoria] * 3 + [Ovapi] * 1, + 11: [Oneal] * 1 + [Doll] * 2 + [Minvo] * 3 + [Kondoria] * 1 + [Ovapi] * 1, + 12: [Oneal] * 1 + [Doll] * 1 + [Minvo] * 1 + [Kondoria] * 4 + [Ovapi] * 1, + 13: [Doll] * 3 + [Minvo] * 3 + [Kondoria] * 3, + 14: [Ovapi] * 7 + [Pass] * 1, + 15: [Doll] * 1 + [Minvo] * 3 + [Kondoria] * 3 + [Pass] * 1, } LEVEL_POWERUPS = { @@ -44,6 +49,11 @@ 8: Powerups.Detonator, 9: Powerups.Bombpass, 10: Powerups.Wallpass, + 11: Powerups.Bombs, + 12: Powerups.Bombs, + 13: Powerups.Detonator, + 14: Powerups.Bombpass, + 15: Powerups.Flames, } diff --git a/viewer.py b/viewer.py index 4aaa13a..b423e7d 100644 --- a/viewer.py +++ b/viewer.py @@ -60,7 +60,13 @@ "down": (2 * 16, 20 * 16), "right": (3 * 16, 20 * 16), } -ENEMIES = {"Balloom": BALLOOM, "Oneal": ONEAL, "Doll": DOLL, "Minvo": MINVO, "Kondoria": KONDORIA, "Ovapi": OVAPI} +PASS = { + "up": (0, 21 * 16), + "left": (16, 21 * 16), + "down": (2 * 16, 21 * 16), + "right": (3 * 16, 21 * 16), +} +ENEMIES = {"Balloom": BALLOOM, "Oneal": ONEAL, "Doll": DOLL, "Minvo": MINVO, "Kondoria": KONDORIA, "Ovapi": OVAPI, "Pass": PASS} POWERUPS = {"Bombs": (0, 14 * 16), "Flames": (1 * 16, 14 * 16), "Detonator": (4 * 16, 14 * 16)} STONE = (48, 48) WALL = (64, 48)