From d322949b5a1dc968d72c38ce224d0d68b97cf08e Mon Sep 17 00:00:00 2001 From: Nicholas Dyer Date: Fri, 12 May 2023 11:46:08 -0400 Subject: [PATCH] changed unneeded attributes in SpriteSheet to regular variables in the constructor --- pocket_friends/game_files/elements/sprites.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pocket_friends/game_files/elements/sprites.py b/pocket_friends/game_files/elements/sprites.py index 6f0bb8e..968876a 100644 --- a/pocket_friends/game_files/elements/sprites.py +++ b/pocket_friends/game_files/elements/sprites.py @@ -19,39 +19,40 @@ class SpriteSheet: sprite sheet, and the width and height of an individual sprite from the sprite sheet. """ # Load in whole sprite sheet as one image. - self.sprite_sheet = pygame.image.load(sprite_sheet).convert_alpha() + sprite_sheet = pygame.image.load(sprite_sheet).convert_alpha() self.images = [] + print(type(self.images)) # Get the sprite sheet json file. with open(texture_json, 'r') as json_file: - self.img_attrib = json.load(json_file) + img_attrib = json.load(json_file) json_file.close() # Count for how many images have been added in the image list image_count = 0 # Get the sprite size as a tuple - sprite_size = self.img_attrib['width'], self.img_attrib['height'] + sprite_size = img_attrib['width'], img_attrib['height'] # Iterate through every image location on the sprite sheet given the sprite size - for i in range(self.sprite_sheet.get_size()[1] // sprite_size[1]): + for i in range(sprite_sheet.get_size()[1] // sprite_size[1]): i *= sprite_size[1] - for j in range(self.sprite_sheet.get_size()[0] // sprite_size[0]): + for j in range(sprite_sheet.get_size()[0] // sprite_size[0]): j *= sprite_size[0] # Create a new transparent surface sprite = pygame.Surface(sprite_size, pygame.SRCALPHA) # Blit the sprite onto the image - sprite.blit(self.sprite_sheet, (0, 0), (j, i, sprite_size[0], sprite_size[1])) + sprite.blit(sprite_sheet, (0, 0), (j, i, sprite_size[0], sprite_size[1])) # Add the image to the list of images self.images.append(sprite) image_count += 1 # Break the loop if the specified number of frames has been reached. - if image_count >= self.img_attrib['frames']: + if image_count >= img_attrib['frames']: break - if image_count >= self.img_attrib['frames']: + if image_count >= img_attrib['frames']: break