Skip to content

Criando superclasse abstrata Pirata e Separando responsabilidades em spawn de itens #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leticiacb1 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Criando superclasse abstrata Pirata e Separando responsabilidades em spawn de itens #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b72ff1d
Abstração: Criando superclasse Pirata.
matheus-1618 Sep 23, 2021
26a1d02
Coesão: Criando função sortea_posicao.
matheus-1618 Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 43 additions & 111 deletions OneBit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ def new(self):
self.init_load = False
self.last_respawn= pygame.time.get_ticks()
self.last_spawn = pygame.time.get_ticks()

#------Criando sprites------#

self.all_sprites = pygame.sprite.Group() #Grupo geral
Expand All @@ -234,18 +235,23 @@ def new(self):
self.cannon4=pygame.sprite.Group()

#Criando sprites de itens:
self.Meat1= pygame.sprite.Group()
self.Meat2= pygame.sprite.Group()
self.Meat3= pygame.sprite.Group()
self.Meat4= pygame.sprite.Group()
self.Rum1= pygame.sprite.Group()
self.Rum2= pygame.sprite.Group()
self.Rum3= pygame.sprite.Group()
self.Rum4= pygame.sprite.Group()
self.tesouro1= pygame.sprite.Group()
self.tesouro2= pygame.sprite.Group()
self.tesouro3= pygame.sprite.Group()
self.tesouro4= pygame.sprite.Group()
# self.Meat1= pygame.sprite.Group()
# self.Meat2= pygame.sprite.Group()
# self.Meat3= pygame.sprite.Group()
# self.Meat4= pygame.sprite.Group()
# self.Rum1= pygame.sprite.Group()
# self.Rum2= pygame.sprite.Group()
# self.Rum3= pygame.sprite.Group()
# self.Rum4= pygame.sprite.Group()
# self.tesouro1= pygame.sprite.Group()
# self.tesouro2= pygame.sprite.Group()
# self.tesouro3= pygame.sprite.Group()
# self.tesouro4= pygame.sprite.Group()

# Itens
self.lista_meat = [pygame.sprite.Group() for i in range(0,4)]
self.lista_rum = [pygame.sprite.Group() for i in range(0,4)]
self.lista_tesouro = [pygame.sprite.Group() for i in range(0,4)]

#------Criando objetos no mapa------#

Expand Down Expand Up @@ -325,38 +331,23 @@ def new(self):
self.camera = Camera(self.map.width, self.map.height)
self.draw_debug = False

def sortea_posicao (self, listaItem, tipoDeObjeto, string, tamanho):
aleatorio = choice(range(1,5))

for i in range(1,tamanho+1):
if aleatorio == i : self.spawan_na_posicaoX (listaItem, tipoDeObjeto, string, i)

def spawan_na_posicaoX (self, lista_item, tipoDeObjeto,string, num):

for sprite in lista_item[num-1].sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == string + str(num): #Na posicao X que será spawnado
tipoDeObjeto(self,tile_object.x, tile_object.y)


def resnasce(self,string):
#Spawnando tesouros pelo mapa
if string == 'Tesouro':
aleatorio=choice([1,2,3,4]) #Sorteando posição de respawn
if aleatorio==1:
for sprite in self.tesouro1.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Tesouro1': #Posição 1
Tesouro(self,tile_object.x, tile_object.y)
if aleatorio==2:
for sprite in self.tesouro2.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Tesouro2': #Posição 2
Tesouro(self,tile_object.x, tile_object.y)
if aleatorio==3:
for sprite in self.tesouro3.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Tesouro3': #Posição 3
Tesouro(self,tile_object.x, tile_object.y)
if aleatorio==4:
for sprite in self.tesouro4.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Tesouro4': #Posição 4
Tesouro(self,tile_object.x, tile_object.y)

#Spawnando canhões nas ilhas
if string=='cannons':
Expand Down Expand Up @@ -452,69 +443,17 @@ def resnasce(self,string):
if tile_object.name == 'pirate_b2':
Pirata_cima(self,self.pirate_cima[PIRATA_CIMA], tile_object.x, tile_object.y)

#Spawnando tesouros pelo mapa
if string == 'Tesouro':
self.sortea_posicao(self.lista_tesouro, Tesouro ,'Tesouro',4)

#Respawn Carnes:
if string == 'Meat':
aleatorio=choice([1,2,3,4]) #Sorteando posição de respawn
if aleatorio==1:
for sprite in self.Meat1.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Meat1': #Posição 1
Carne(self,tile_object.x, tile_object.y)
if aleatorio==2:
for sprite in self.Meat2.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Meat2': #Posição 2
Carne(self,tile_object.x, tile_object.y)
if aleatorio==3:
for sprite in self.Meat3.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Meat3': #Posição 3
Carne(self,tile_object.x, tile_object.y)
if aleatorio==4:
for sprite in self.Meat2.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Meat4': #Posição 4
Carne(self,tile_object.x, tile_object.y)
self.sortea_posicao(self.lista_meat, Carne,'Meat',4)

#Respawn Rum:
if string == 'Rum':
aleatorio=choice([1,2,3,4]) #Sorteando posição de respawn
if aleatorio==1:
for sprite in self.Rum1.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Rum1': #Posição 1
Rum(self,tile_object.x, tile_object.y)
if aleatorio==2:
for sprite in self.Rum2.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Rum2': #Posição 2
Rum(self,tile_object.x, tile_object.y)
if aleatorio==3:
for sprite in self.Rum3.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Rum3': #Posição 3
Rum(self,tile_object.x, tile_object.y)
if aleatorio==4:
for sprite in self.Rum4.sprites():
sprite.kill()
self.last_spawn = pygame.time.get_ticks() #Pegando tempo de spawn
for tile_object in self.map.tmxdata.objects:
if tile_object.name == 'Rum4': #Posição 4
Rum(self,tile_object.x, tile_object.y)
self.sortea_posicao(self.lista_rum, Rum,'Rum',4)

def run(self):

Expand Down Expand Up @@ -908,9 +847,7 @@ def update(self):

#------Player colide com Itens------#

lista_tesouro=[self.tesouro1, self.tesouro2, self.tesouro3, self.tesouro4]

for i in lista_tesouro:
for i in self.lista_tesouro:
hits = pygame.sprite.spritecollide (self.boat, i, False, pygame.sprite.collide_mask)
for hit in hits:
channel2=self.sound_effects['pirata2'].play()
Expand All @@ -920,21 +857,16 @@ def update(self):

#Criando lista para armazenar carne

lista_carne=[self.Meat1, self.Meat2, self.Meat3, self.Meat4]

for i in lista_carne:
for i in self.lista_meat:
hits = pygame.sprite.spritecollide (self.boat, i, False, pygame.sprite.collide_mask)
for hit in hits:
channel2=self.sound_effects['pirata4'].play()
self.boat.health+= CARNE_LIFE
self.xp_total+=CARNE_XP
hit.kill()
self.resnasce('Meat')

#Criando lista para armazenar bebida
lista_rum=[self.Rum1, self.Rum2, self.Rum3, self.Rum4]

for i in lista_rum:
for i in self.lista_rum:
hits = pygame.sprite.spritecollide (self.boat, i, False, pygame.sprite.collide_mask)
for hit in hits:
channel2=self.sound_effects['pirata3'].play()
Expand Down
Loading