From 1a96acb3eb8388442a8032b0b30aab4ecfcdec17 Mon Sep 17 00:00:00 2001 From: Unbewohnte Date: Wed, 19 Aug 2020 12:18:49 +0300 Subject: [PATCH] Started to understand the matter of clean code. Added image import file --- Main.py | 14 +++++++++++++- beings.py | 24 +++++++++++++----------- images.py | 9 +++++++++ pics/timesurf.png | Bin 0 -> 17115 bytes surfaces.py | 32 +++++++++++++++++++++++++------- 5 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 images.py create mode 100644 pics/timesurf.png diff --git a/Main.py b/Main.py index a74a139..201cdce 100644 --- a/Main.py +++ b/Main.py @@ -3,7 +3,7 @@ import pygame_menu import sys from bullets import Bullet from beings import * -from surfaces import Surface +from surfaces import SlowTimeSurf from particles import * ######## Set up things that will not change pygame.init() @@ -21,6 +21,7 @@ def play(): FPS = 70 clock = pygame.time.Clock() pygame.mouse.set_visible(False) + slowsurf = SlowTimeSurf(400,20) enemy = Enemy(100,100) enemy2 = Enemy(windowX,200) player = Player() @@ -47,11 +48,21 @@ def play(): ########################## #PPPPPPPPPPPPPPPPPPPPPPPPP + slowsurf.place(window) + if slowsurf.collide(player.player_rect): + enemy.vel -= 0.1 + enemy2.vel -= 0.1 + print("Colliding !") + else: + enemy.vel = 3 + enemy2.vel = 3 + player.teleportation() player.shoot(window) player.draw(window) player.update() player.collision(window) + if player.out_of_area(): death_timer -= 1 timertext_color = (255-death_timer-60,3.6*death_timer,10) @@ -62,6 +73,7 @@ def play(): break else: death_timer = 70 + #PPPPPPPPPPPPPPPPPPPPPPPPP #EEEEEEEEEEEEEEEEEEEEEEEEE diff --git a/beings.py b/beings.py index 8b8a386..120a681 100644 --- a/beings.py +++ b/beings.py @@ -3,18 +3,20 @@ from random import randint from time import time from bullets import * from particles import * +from images import * import time import sys ############ windowX = 832 windowY = 832 -############ imgs for player-enemy(self,bullet) -bullet_image = pygame.image.load('pics/second_bullet.png') -enemy_bul_img = pygame.image.load('pics/bullet.png') -enemy_image = pygame.image.load('pics/32x64.png') -player_image = pygame.image.load('pics/32x64.png') -############ +# ############ imgs for player-enemy(self,bullet), surfaces +# bullet_image = pygame.image.load('pics/second_bullet.png') +# enemy_bul_img = pygame.image.load('pics/bullet.png') +# enemy_image = pygame.image.load('pics/32x64.png') +# player_image = pygame.image.load('pics/32x64.png') +# timesurf_image = pygame.image.load('pics/timesurf.png') +# ############ class Player: def __init__(self): @@ -28,16 +30,16 @@ class Player: self.player_rect = pygame.Rect(self.x, self.y, self.width, self.height) def update(self): keys = pygame.key.get_pressed() - if keys[pygame.K_LEFT] and self.x - self.vel > 5 : + if keys[pygame.K_LEFT] and self.x - self.vel > 0 : self.x -= self.vel - if keys[pygame.K_RIGHT] and self.x + self.vel < windowX- self.width - 5 : + if keys[pygame.K_RIGHT] and self.x + self.width + self.vel < windowX: self.x += self.vel - if keys[pygame.K_UP] and self.y + self.height - self.vel > self.height + 5 : + if keys[pygame.K_UP] and self.y - self.vel > 0: self.y -= self.vel - if keys[pygame.K_DOWN] and self.y + self.height + self.vel < windowY-15 : + if keys[pygame.K_DOWN] and self.y + self.height + self.vel < windowY : self.y += self.vel def draw(self,window): @@ -87,7 +89,7 @@ class Player: self.tp_cooldown = 100 def out_of_area(self): - if self.x + self.width > windowX or self.x < 0 or self.y+self.height > windowY or self.y < 0: + if self.x + self.width > windowX+3 or self.x < 0 - 3 or self.y+self.height > windowY+3 or self.y < 0 -3: return True else: return False diff --git a/images.py b/images.py new file mode 100644 index 0000000..9b146cb --- /dev/null +++ b/images.py @@ -0,0 +1,9 @@ +import pygame + +############ imgs for player-enemy(self,bullet), surfaces +bullet_image = pygame.image.load('pics/second_bullet.png') +enemy_bul_img = pygame.image.load('pics/bullet.png') +enemy_image = pygame.image.load('pics/32x64.png') +player_image = pygame.image.load('pics/32x64.png') +timesurf_image = pygame.image.load('pics/timesurf.png') +############ diff --git a/pics/timesurf.png b/pics/timesurf.png new file mode 100644 index 0000000000000000000000000000000000000000..43b8d609337e4b74471cac755824f1aaa05e0132 GIT binary patch literal 17115 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 AaR2}S literal 0 HcmV?d00001 diff --git a/surfaces.py b/surfaces.py index ec1a859..3ff9735 100644 --- a/surfaces.py +++ b/surfaces.py @@ -1,12 +1,30 @@ import pygame from beings import * - +from images import timesurf_image class Surface: - def __init__(self,name): - if str(name) == 'killsurf': - self.width = windowX - self.height = windowY + def __init__(self,surf_x,surf_y): + self.x = surf_x + self.y = surf_y + self.width = 32 + self.height = 64 self.color = (30,70,40) - + self.rect = pygame.Rect(self.x,self.y,self.width,self.height,) def place(self,window,surf_x,surf_y): - pygame.draw.rect(window,self.color,(surf_x,surf_y,self.width,self.height)) + pygame.draw.rect(window,self.color,self.rect) + +class SlowTimeSurf: + def __init__(self,surf_x,surf_y): + self.x = surf_x + self.y = surf_y + self.width = 32 + self.height = 64 + self.color = (0,0,0) + self.rect = pygame.Rect(self.x, self.y, self.width, self.height) + def place(self,window): + pygame.draw.rect(window,self.color,self.rect) + window.blit(timesurf_image,(self.rect[0], self.rect[1])) + def collide(self,object): + if self.rect.colliderect(object): + return True + else: + return False