diff --git a/Player.py b/Player.py index d42789d..add853f 100644 --- a/Player.py +++ b/Player.py @@ -12,29 +12,33 @@ class Player(pygame.sprite.Sprite): def __init__(self): self.imgDir = os.path.join(os.path.dirname(__file__), 'data') + playerImage = pygame.image.load(os.path.join(self.imgDir, 'player.png')).convert() + self.walkImages = ( - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'player1.png')).convert(), (64, 98)), - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'player2.png')).convert(), (64, 98)), - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'player3.png')).convert(), (64, 98)), - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'player2.png')).convert(), (64, 98)), + pygame.transform.scale(playerImage.subsurface((0, 0, 16, 24)), (64, 98)), + pygame.transform.scale(playerImage.subsurface((16, 0, 16, 24)), (64, 98)), + pygame.transform.scale(playerImage.subsurface((32, 0, 16, 24)), (64, 98)), + pygame.transform.scale(playerImage.subsurface((16, 0, 16, 24)), (64, 98)), ) self.currentWalkImage = 0 self.upImages = ( - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'playerUp1.png')).convert(), (64, 98)), - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'playerUp2.png')).convert(), (64, 98)), + pygame.transform.scale(playerImage.subsurface((0, 24, 16, 24)), (64, 98)), + pygame.transform.scale(playerImage.subsurface((16, 24, 16, 24)), (64, 98)), + pygame.transform.scale(playerImage.subsurface((32, 24, 16, 24)), (64, 98)), ) self.currentUpImage = 0 self.downImages = ( - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'playerDown1.png')).convert(), (64, 98)), - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'playerDown2.png')).convert(), (64, 98)), + pygame.transform.scale(playerImage.subsurface((0, 48, 16, 24)), (64, 98)), + pygame.transform.scale(playerImage.subsurface((16, 48, 16, 24)), (64, 98)), + pygame.transform.scale(playerImage.subsurface((32, 48, 16, 24)), (64, 98)), ) self.currentDownImage = 0 self.crouchImages = ( - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'playerCrouch1.png')).convert(), (64, 64)), - pygame.transform.scale(pygame.image.load(os.path.join(self.imgDir, 'playerCrouch2.png')).convert(), (64, 64)), + pygame.transform.scale(playerImage.subsurface((0, 72, 16, 16)), (64, 64)), + pygame.transform.scale(playerImage.subsurface((16, 72, 16, 16)), (64, 64)), ) self.currentCrouchImage = 0 diff --git a/data/player.png b/data/player.png new file mode 100644 index 0000000..48889f4 Binary files /dev/null and b/data/player.png differ diff --git a/data/player.xcf b/data/player.xcf index 3a2cebe..e391bb7 100644 Binary files a/data/player.xcf and b/data/player.xcf differ diff --git a/data/player1.png b/data/player1.png deleted file mode 100644 index 6feac73..0000000 Binary files a/data/player1.png and /dev/null differ diff --git a/data/player2.png b/data/player2.png deleted file mode 100644 index 8f72db5..0000000 Binary files a/data/player2.png and /dev/null differ diff --git a/data/player3.png b/data/player3.png deleted file mode 100644 index 28a2d77..0000000 Binary files a/data/player3.png and /dev/null differ diff --git a/data/playerCrouch1.png b/data/playerCrouch1.png deleted file mode 100644 index 7f17dcf..0000000 Binary files a/data/playerCrouch1.png and /dev/null differ diff --git a/data/playerCrouch2.png b/data/playerCrouch2.png deleted file mode 100644 index 6b92de1..0000000 Binary files a/data/playerCrouch2.png and /dev/null differ diff --git a/data/playerDown1.png b/data/playerDown1.png deleted file mode 100644 index 297bf6a..0000000 Binary files a/data/playerDown1.png and /dev/null differ diff --git a/data/playerDown2.png b/data/playerDown2.png deleted file mode 100644 index a5b372b..0000000 Binary files a/data/playerDown2.png and /dev/null differ diff --git a/data/playerUp1.png b/data/playerUp1.png deleted file mode 100644 index 2bae6ed..0000000 Binary files a/data/playerUp1.png and /dev/null differ diff --git a/data/playerUp2.png b/data/playerUp2.png deleted file mode 100644 index 800b7fa..0000000 Binary files a/data/playerUp2.png and /dev/null differ