Abstração e coesão #1
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,198 +1,173 @@ | ||
| import pygame | ||
| import time | ||
| from baixar_assets import baixar_assets | ||
| from configurações import janela_alt, janela_comp, janela | ||
| from pont import pontuacao | ||
| from titulo import titulo | ||
| import random | ||
| from pygame.time import wait | ||
|
|
||
| pygame.init() | ||
| # Configurações da janela do jogo | ||
|
|
||
| # Configurações das paredes (o player morre quando encosta nas paredes) | ||
| while True: | ||
| # janela=pygame.display.set_mode((janela_comp,janela_alt)) | ||
| pygame.display.set_caption('Jogo da cobrinha') | ||
| fps = 15 | ||
|
|
||
|
There was a problem hiding this comment. issue (complexity): Consider extracting repeated initialization sequences into helper functions to reduce duplication and improve code clarity, such as asset loading and fruit position generation, and then calling these functions in the appropriate places to avoid re-initialization within loops, which simplifies the code and makes it easier to maintain and understand without altering the game's functionality.. The code currently re-initializes the same state (e.g. re-fetching assets and re-setting the fruit position/spawn) multiple times. To reduce duplication and improve clarity without changing functionality, consider extracting these repeated sequences into helper functions. For example: def init_assets():
return baixar_assets()
def get_new_fruit():
return [random.randrange(1, (janela_comp // 10)) * 10,
random.randrange(1, (janela_alt // 10)) * 10]
# Initial setup
pygame.display.set_caption('Jogo da cobrinha')
fps = 15
assets = init_assets()
fruta_pos = get_new_fruit()
fruta_spawn = TrueThen remove the second occurrences of these initializations in the inner loop. This consolidates state setup and reduces clutter. |
||
| assets = baixar_assets() | ||
|
There was a problem hiding this comment. suggestion (performance): Duplicate asset loading detected. The function baixar_assets() is called twice consecutively without a change in state between the calls. It would be more efficient to load the assets only once, unless there is a specific reason for refreshing them. Suggested implementation: pygame.display.set_caption('Jogo da cobrinha')
fps = 15
assets = baixar_assets()
# Sons e Musica do jogo
pygame.mixer.music.load('assets/musica_jogo6.mp3')
# Configurações das paredes (o player morre quando encosta nas paredes)
while True:
# janela=pygame.display.set_mode((janela_comp,janela_alt))Make sure that there is no other call to baixar_assets() inside the loop or elsewhere causing duplicate asset loading. |
||
| # Sons e Musica do jogo | ||
| pygame.mixer.music.load('assets/musica_jogo6.mp3') | ||
| pygame.mixer.music.play(-1) # Loop infinito para rodar o jogo inteiro | ||
| # Som quando a cobra comer a fruta | ||
| som_comer = pygame.mixer.Sound('assets/comer_fruta.mp3') | ||
| # Som quando a cobra encostar nela mesma ou nas paredes | ||
| som_colisao = pygame.mixer.Sound('assets/game-over-31.mp3') | ||
|
|
||
|
|
||
| sentido = 'DIR' | ||
| prox_dir = sentido | ||
|
|
||
| cobra_pos = [300, 150] | ||
| cobra_corpo = [(300, 150), | ||
| (290, 150), | ||
| (280, 150), | ||
| (270, 150)] | ||
|
|
||
| fruta_pos = [random.randrange(1, (janela_comp//10))*10, | ||
| random.randrange(1, (janela_alt//10))*10] | ||
| fruta_spawn = True | ||
|
|
||
| clock = pygame.time.Clock() | ||
| assets = baixar_assets() | ||
|
|
||
| fruta_pos = [random.randrange(1, (janela_comp//10))*10, | ||
| random.randrange(1, (janela_alt//10))*10] | ||
| fruta_spawn = True | ||
|
|
||
| # Posição do jogador | ||
|
|
||
| # Estados | ||
| FINAL = 0 | ||
| JOGANDO = 1 | ||
| MORRENDO = 2 | ||
| estado = JOGANDO | ||
|
|
||
| pontos = 0 | ||
| tem_fruta = True | ||
|
|
||
| fps = titulo() | ||
|
|
||
| while True: | ||
|
|
||
| janela.fill((0, 0, 0)) | ||
| janela.blit(assets['mundo'], (0, 0)) | ||
| pontuacao((0, 0, 0), 'open sans', 20, pontos) | ||
|
|
||
| for event in pygame.event.get(): | ||
| if event.type == pygame.QUIT: | ||
|
|
||
| pygame.quit() | ||
| break | ||
|
|
||
| if event.type == pygame.KEYDOWN: | ||
| if event.key == pygame.K_LEFT or event.key == pygame.K_a: | ||
| if sentido != 'DIR': | ||
| prox_dir = 'ESQ' | ||
|
|
||
| elif event.key == pygame.K_RIGHT or event.key == pygame.K_d: | ||
| if sentido != 'ESQ': | ||
| prox_dir = 'DIR' | ||
| elif event.key == pygame.K_UP or event.key == pygame.K_w: | ||
| if sentido != 'BAIXO': | ||
| prox_dir = 'CIMA' | ||
| elif event.key == pygame.K_DOWN or event.key == pygame.K_s: | ||
| if sentido != 'CIMA': | ||
| prox_dir = 'BAIXO' | ||
|
|
||
| # Atualizando a direção | ||
| sentido = prox_dir | ||
|
|
||
| # Movimentando a cobra | ||
| if sentido == 'CIMA': | ||
| cobra_pos[1] -= 10 | ||
| elif sentido == 'BAIXO': | ||
| cobra_pos[1] += 10 | ||
| elif sentido == 'ESQ': | ||
| cobra_pos[0] -= 10 | ||
| elif sentido == 'DIR': | ||
| cobra_pos[0] += 10 | ||
|
|
||
| # Fazendo a cobra crescer a cada vez que encosta em uma fruta: | ||
| cobra_corpo.insert(0, list(cobra_pos)) | ||
| if cobra_pos[0] == fruta_pos[0] and cobra_pos[1] == fruta_pos[1]: | ||
| pontos += 100 | ||
| fruta_spawn = False | ||
| som_comer.play() | ||
| else: | ||
| cobra_corpo.pop() | ||
|
|
||
| if not fruta_spawn: | ||
| fruta_pos = [random.randrange(1, (janela_comp//10))*10, | ||
| random.randrange(1, (janela_alt//10))*10] | ||
| fruta_spawn = True | ||
|
|
||
| # Desenhando a cobra: | ||
|
|
||
| for i, pos in enumerate(cobra_corpo): | ||
| # Caso a cobra mude de direção, muda o sprite | ||
|
|
||
| if list(pos) == cobra_pos: | ||
| # Cabeça da cobra | ||
| if sentido == 'CIMA': | ||
| janela.blit(assets['cabeca_cima'], (pos[0], pos[1])) | ||
| elif sentido == 'BAIXO': | ||
| janela.blit(assets['cabeca_baixo'], (pos[0], pos[1])) | ||
| elif sentido == 'ESQ': | ||
| janela.blit(assets['cabeca_esq'], (pos[0], pos[1])) | ||
| elif sentido == 'DIR': | ||
| janela.blit(assets['cabeca_dir'], (pos[0], pos[1])) | ||
| elif i == len(cobra_corpo)-1: | ||
| # Rabo | ||
| if sentido == 'CIMA': | ||
| janela.blit(assets['rabo_cima'], (pos[0], pos[1])) | ||
| elif sentido == 'BAIXO': | ||
| janela.blit(assets['rabo_baixo'], (pos[0], pos[1])) | ||
| elif sentido == 'ESQ': | ||
| janela.blit(assets['rabo_esq'], (pos[0], pos[1])) | ||
| else: | ||
| janela.blit(assets['rabo_dir'], (pos[0], pos[1])) | ||
|
|
||
| else: | ||
| # Corpo | ||
| if sentido in ['BAIXO', 'CIMA']: | ||
| janela.blit(assets['corpo_v'], (pos[0], pos[1])) | ||
| else: | ||
| janela.blit(assets['corpo_h'], (pos[0], pos[1])) | ||
| # desenha a fruta | ||
| janela.blit(assets['comida'], (fruta_pos[0], fruta_pos[1])) | ||
|
|
||
| pygame.display.update() | ||
|
|
||
| clock.tick(fps) | ||
|
|
||
| # Morre quando a cobra encosta em si mesma | ||
| Game_over = False | ||
| for corpo in cobra_corpo[1:]: | ||
| if cobra_pos == list(corpo): | ||
| Game_over = True | ||
| break | ||
|
|
||
| # Game over | ||
|
|
||
| if cobra_pos[0] < 0 or cobra_pos[0] > janela_comp-10 or Game_over == True: | ||
| som_colisao.play() | ||
| wait(2000) | ||
| # pygame.quit() | ||
| break | ||
| elif cobra_pos[1] < 0 or cobra_pos[1] > janela_alt-10: | ||
| som_colisao.play() | ||
| wait(2000) | ||
| # pygame.quit() | ||
| break | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue (code-quality): Hoist statements out of for/while loops (
hoist-statement-from-loop)