diff --git a/pythonProject1/.idea/.name b/pythonProject1/.idea/.name new file mode 100644 index 0000000..3eb02f8 --- /dev/null +++ b/pythonProject1/.idea/.name @@ -0,0 +1 @@ +mario_level_1.py \ No newline at end of file diff --git a/pythonProject1/.idea/vcs.xml b/pythonProject1/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/pythonProject1/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pythonProject1/data/components/bricks.py b/pythonProject1/data/components/bricks.py index c4e421a..b644ac3 100644 --- a/pythonProject1/data/components/bricks.py +++ b/pythonProject1/data/components/bricks.py @@ -133,7 +133,6 @@ class Brick(pg.sprite.Sprite): class BrickPiece(pg.sprite.Sprite): - """Pieces that appear when bricks are broken""" def __init__(self, x, y, xvel, yvel): super(BrickPiece, self).__init__() self.sprite_sheet = setup.GFX['item_objects'] diff --git a/pythonProject1/data/components/castle_flag.py b/pythonProject1/data/components/castle_flag.py index 4720e52..738f7f3 100644 --- a/pythonProject1/data/components/castle_flag.py +++ b/pythonProject1/data/components/castle_flag.py @@ -6,9 +6,8 @@ from .. import constants as c class Flag(pg.sprite.Sprite): - """Flag on the castle""" def __init__(self, x, y): - """Initialize object""" + super(Flag, self).__init__() self.sprite_sheet = setup.GFX['item_objects'] self.image = self.get_image(129, 2, 14, 14) @@ -21,7 +20,7 @@ class Flag(pg.sprite.Sprite): def get_image(self, x, y, width, height): - """Extracts image from sprite sheet""" + image = pg.Surface([width, height]) rect = image.get_rect() @@ -40,11 +39,11 @@ class Flag(pg.sprite.Sprite): self.resting() def rising(self): - """State when flag is rising to be on the castle""" + self.rect.y += self.y_vel if self.rect.bottom <= self.target_height: self.state = 'resting' def resting(self): - """State when the flag is stationary doing nothing""" + pass diff --git a/pythonProject1/data/components/checkpoint.py b/pythonProject1/data/components/checkpoint.py index 4d52086..ec63a39 100644 --- a/pythonProject1/data/components/checkpoint.py +++ b/pythonProject1/data/components/checkpoint.py @@ -5,8 +5,7 @@ from .. import constants as c class Checkpoint(pg.sprite.Sprite): - """Invisible sprite used to add enemies, special boxes - and trigger sliding down the flag pole""" + def __init__(self, x, name, y=0, width=10, height=600): super(Checkpoint, self).__init__() self.image = pg.Surface((width, height)) diff --git a/pythonProject1/data/constants.py b/pythonProject1/data/constants.py index beea4a3..183c70c 100644 --- a/pythonProject1/data/constants.py +++ b/pythonProject1/data/constants.py @@ -1,15 +1,8 @@ - - SCREEN_HEIGHT = 600 SCREEN_WIDTH = 800 - SCREEN_SIZE = (SCREEN_WIDTH,SCREEN_HEIGHT) - ORIGINAL_CAPTION = "Super Mario Bros 1-1" -## COLORS ## - -# R G B GRAY = (100, 100, 100) NAVYBLUE = ( 60, 60, 100) WHITE = (255, 255, 255) @@ -26,31 +19,22 @@ BLACK = ( 0, 0, 0) NEAR_BLACK = ( 19, 15, 48) COMBLUE = (233, 232, 255) GOLD = (255, 215, 0) - BGCOLOR = WHITE - SIZE_MULTIPLIER = 2.5 BRICK_SIZE_MULTIPLIER = 2.69 BACKGROUND_MULTIPLER = 2.679 GROUND_HEIGHT = SCREEN_HEIGHT - 62 - -#MARIO FORCES WALK_ACCEL = .15 RUN_ACCEL = 20 SMALL_TURNAROUND = .35 - GRAVITY = 1.01 JUMP_GRAVITY = .31 JUMP_VEL = -10 FAST_JUMP_VEL = -12.5 MAX_Y_VEL = 11 - MAX_RUN_SPEED = 800 MAX_WALK_SPEED = 6 - -#Mario States - STAND = 'standing' WALK = 'walk' JUMP = 'jump' @@ -61,21 +45,17 @@ BIG_TO_SMALL = 'big to small' FLAGPOLE = 'flag pole' WALKING_TO_CASTLE = 'walking to castle' END_OF_LEVEL_FALL = 'end of level fall' - - #GOOMBA Stuff LEFT = 'left' RIGHT = 'right' JUMPED_ON = 'jumped on' DEATH_JUMP = 'death jump' - #KOOPA STUFF SHELL_SLIDE = 'shell slide' #BRICK STATES - RESTING = 'resting' BUMPED = 'bumped' @@ -83,42 +63,28 @@ BUMPED = 'bumped' OPENED = 'opened' #MUSHROOM STATES - REVEAL = 'reveal' SLIDE = 'slide' - #COIN STATES - SPIN = 'spin' - #STAR STATES - BOUNCE = 'bounce' - #FIRE STATES - FLYING = 'flying' BOUNCING = 'bouncing' EXPLODING = 'exploding' - #Brick and coin box contents - MUSHROOM = 'mushroom' STAR = 'star' FIREFLOWER = 'fireflower' SIXCOINS = '6coins' COIN = 'coin' LIFE_MUSHROOM = '1up_mushroom' - FIREBALL = 'fireball' - #LIST of ENEMIES - GOOMBA = 'goomba' KOOPA = 'koopa' - #LEVEL STATES - FROZEN = 'frozen' NOT_FROZEN = 'not frozen' IN_CASTLE = 'in castle' diff --git a/pythonProject1/data/game_sound.py b/pythonProject1/data/game_sound.py index bba2e31..3aa12c8 100644 --- a/pythonProject1/data/game_sound.py +++ b/pythonProject1/data/game_sound.py @@ -2,9 +2,7 @@ import pygame as pg from . import setup from . import constants as c - class Sound(object): - """Handles all sound for the game""" def __init__(self, overhead_info): """Initialize the class""" self.sfx_dict = setup.SFX @@ -13,8 +11,6 @@ class Sound(object): self.game_info = overhead_info.game_info self.set_music_mixer() - - def set_music_mixer(self): """Sets music for level""" if self.overhead_info.state == c.LEVEL: @@ -25,8 +21,6 @@ class Sound(object): pg.mixer.music.load(self.music_dict['game_over']) pg.mixer.music.play() self.state = c.GAME_OVER - - def update(self, game_info, mario): """Updates sound object with game info""" self.game_info = game_info diff --git a/pythonProject1/data/setup.py b/pythonProject1/data/setup.py index 5267f26..a46338f 100644 --- a/pythonProject1/data/setup.py +++ b/pythonProject1/data/setup.py @@ -1,13 +1,8 @@ -""" -This module initializes the display and creates dictionaries of resources. -""" - import os import pygame as pg from . import tools from .import constants as c - ORIGINAL_CAPTION = c.ORIGINAL_CAPTION diff --git a/pythonProject1/data/tools.py b/pythonProject1/data/tools.py index 429a69c..5981628 100644 --- a/pythonProject1/data/tools.py +++ b/pythonProject1/data/tools.py @@ -97,7 +97,6 @@ class _State(object): def startup(self, current_time, persistant): self.persist = persistant self.start_time = current_time - def cleanup(self): self.done = False return self.persist @@ -105,8 +104,6 @@ class _State(object): def update(self, surface, keys, current_time): pass - - def load_all_gfx(directory, colorkey=(255,0,255), accept=('.png', 'jpg', 'bmp')): graphics = {} for pic in os.listdir(directory): diff --git a/pythonProject1/resources/fonts/__init__.py b/pythonProject1/resources/fonts/__init__.py index df77b7f..8b13789 100644 --- a/pythonProject1/resources/fonts/__init__.py +++ b/pythonProject1/resources/fonts/__init__.py @@ -1 +1 @@ -__author__ = 'justinarmstrong' + diff --git a/pythonProject1/resources/graphics/__init__.py b/pythonProject1/resources/graphics/__init__.py index df77b7f..8b13789 100644 --- a/pythonProject1/resources/graphics/__init__.py +++ b/pythonProject1/resources/graphics/__init__.py @@ -1 +1 @@ -__author__ = 'justinarmstrong' + diff --git a/pythonProject1/resources/graphics/level_1.png b/pythonProject1/resources/graphics/level_1.png index ea814d9..d261f9e 100644 Binary files a/pythonProject1/resources/graphics/level_1.png and b/pythonProject1/resources/graphics/level_1.png differ