s464965/WMICraft
5
2
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft into stats

Browse Source 
 Conflicts:
	logic/game.py
	ui/stats.py
This commit is contained in:
XsedoX 2022-05-13 10:06:23 +02:00
commit 89c307535b
4 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
logic/game.py
View File

@ -26,6 +26,7 @@ class Game:
self.bg = pygame.image.load("./resources/textures/bg.jpg")
self.screens = {'credits': Credits(self.screen, self.clock), 'options': Options(self.screen, self.clock)}
def main_menu(self):
menu = MainMenu(self.screen, self.clock, self.bg,
self.game,
@ -43,9 +44,7 @@ class Game:
# create level
level.create_map()
stats = Stats(self.screen,
level.list_knights_blue,
level.list_knights_red) # has to be called after level.create_map()
stats = Stats(self.screen, level.list_knights_blue, level.list_knights_red)
print_numbers_flag = False
running = True
@ -61,6 +60,7 @@ class Game:
running = False
if event.key == pygame.K_n:
print_numbers_flag = not print_numbers_flag
if event.type == NEXT_TURN: # is called every 'TURN_INTERVAL' milliseconds
level.handle_turn()

21
logic/health_bar.py
View File

@ -9,7 +9,6 @@ class HealthBar:
self.rect = rect
self.screen = screen
self.current_hp = current_hp
self.target_hp = current_hp
self.max_hp = max_hp
self.x = self.rect.x
self.y = self.rect.y
@ -38,22 +37,22 @@ class HealthBar:
self.health_ratio = self.max_hp / self.width
def take_dmg(self, dmg_taken):
if self.target_hp > 0:
self.target_hp -= dmg_taken
elif self.target_hp < 0:
self.target_hp = 0
def take_dmg(self, amount):
if self.current_hp - amount > 0:
self.current_hp -= amount
elif self.current_hp - amount <= 0:
self.current_hp = 0
def heal(self, amount):
if self.target_hp < self.max_hp:
self.target_hp += amount
elif self.target_hp > self.max_hp:
self.target_hp = self.max_hp
if self.current_hp + amount < self.max_hp:
self.current_hp += amount
elif self.current_hp + amount > self.max_hp:
self.current_hp = self.max_hp
def show(self):
pygame.Surface.fill(self.screen, BLACK, (self.x-1, self.y-1, self.width+2, self.height+2))
pygame.Surface.fill(self.screen, RED, (self.x, self.y, self.width, self.height))
pygame.Surface.fill(self.screen, GREEN, (self.x, self.y, int(self.target_hp / self.health_ratio), self.height))
pygame.Surface.fill(self.screen, GREEN, (self.x, self.y, int(self.current_hp / self.health_ratio), self.height))

15
models/knight.py
View File

@ -34,11 +34,10 @@ class Knight(pygame.sprite.Sprite):
self.team = team
self.max_hp = random.randint(7, 12)
self.current_hp = random.randint(1, self.max_hp)
self.attack = random.randint(4, 7)
self.defense = random.randint(1, 4)
self.points = 1
self.health_bar = HealthBar(screen, self.rect, current_hp=self.current_hp, max_hp=self.max_hp, calculate_xy=True, calculate_size=True)
self.health_bar = HealthBar(screen, self.rect, current_hp=random.randint(1, self.max_hp), max_hp=self.max_hp, calculate_xy=True, calculate_size=True)
def rotate_left(self):
self.direction = self.direction.left()
@ -48,6 +47,18 @@ class Knight(pygame.sprite.Sprite):
self.direction = self.direction.right()
self.image = self.states[self.direction.value]
def take_dmg(self, amount):
self.health_bar.take_dmg(amount)
def heal(self, amount):
self.health_bar.heal(amount)
def get_current_hp(self):
return self.health_bar.current_hp
def get_max_hp(self):
return self.health_bar.max_hp
def step_forward(self):
if self.direction.name == 'UP':
self.position = (self.position[0], self.position[1] - 1)

27
ui/stats.py
View File

@ -15,25 +15,14 @@ class Stats:
self.screen = screen
self.x = (GRID_CELL_PADDING + GRID_CELL_SIZE) * COLUMNS + BORDER_WIDTH + 15
self.y = 5
self.max_hp = 0
self.blue_team_current_hp = 0
self.red_team_current_hp = 0
for knight in list_knights_red:
self.max_hp += knight.max_hp
self.red_team_current_hp += knight.current_hp
for knight in list_knights_blue:
self.blue_team_current_hp += knight.current_hp
self.blue_team_hp_bar = HealthBar(self.screen,
pygame.Rect(self.x + 30, self.y + 210, 100, 15),
current_hp=self.blue_team_current_hp,
max_hp=self.max_hp)
current_hp=sum([knight.get_current_hp() for knight in self.list_knights_blue]),
max_hp=sum([knight.get_max_hp() for knight in self.list_knights_blue]))
self.red_team_hp_bar = HealthBar(self.screen,
pygame.Rect(self.x + 210, self.y + 210, 100, 15),
current_hp=self.red_team_current_hp,
max_hp=self.max_hp)
current_hp=sum([knight.get_current_hp() for knight in self.list_knights_red]),
max_hp=sum([knight.get_max_hp() for knight in self.list_knights_red]))
def update(self):
@ -52,14 +41,18 @@ class Stats:
draw_text('VS', FONT_DARK, self.screen, self.x + 150, self.y + 120, 36)
# HP bars
self.red_team_hp_bar.take_dmg(self.red_team_hp_bar.current_hp -
sum([knight.get_current_hp() for knight in self.list_knights_red]))
self.blue_team_hp_bar.take_dmg(self.blue_team_hp_bar.current_hp -
sum([knight.get_current_hp() for knight in self.list_knights_blue]))
self.red_team_hp_bar.update()
self.blue_team_hp_bar.update()
# texts
draw_text('Rycerze: ' + str(len(self.list_knights_blue)), FONT_DARK, self.screen, self.x + 35, self.y + 240, 18) # blue
draw_text('Fortece: 0', FONT_DARK, self.screen, self.x + 35, self.y + 270, 18) # red
draw_text('Fortece: ' + str(len(self.list_knights_red)), FONT_DARK, self.screen, self.x + 35, self.y + 270, 18) # red
draw_text('Rycerze: ' + str(len(self.list_knights_red)), FONT_DARK, self.screen, self.x + 215, self.y + 240, 18)
draw_text('Rycerze: 4', FONT_DARK, self.screen, self.x + 215, self.y + 240, 18)
draw_text('Fortece: 0', FONT_DARK, self.screen, self.x + 215, self.y + 270, 18)
# points