WallyHackenslacker/Super-HUGS-Revolution-98
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Added cancel (back to main menu) to InGameState.

Browse Source
This commit is contained in:
Wally Hackenslacker
2013-01-21 22:44:22 -04:30
parent 9f0f5c47e9
commit d7a3e41d9f
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ingame.py
View File

@@ -26,6 +26,7 @@ class InGameState(BaseState):
self.cursor_x = 0 self.cursor_x = 0
self.cursor_y = 0 self.cursor_y = 0
self.user_click = False self.user_click = False
self.cancel = False
self.time_left = 190 self.time_left = 190
self.then = pygame.time.get_ticks() self.then = pygame.time.get_ticks()
@@ -165,8 +166,7 @@ class InGameState(BaseState):
if event.type == pygame.KEYDOWN: if event.type == pygame.KEYDOWN:
if event.key == pygame.K_ESCAPE: if event.key == pygame.K_ESCAPE:
self.next_transition = VALID_STATES['QUIT'] self.cancel = True
self.user_click = True
if event.type == pygame.QUIT: if event.type == pygame.QUIT:
self.next_transition = VALID_STATES['QUIT'] self.next_transition = VALID_STATES['QUIT']
@@ -188,8 +188,6 @@ class InGameState(BaseState):
self.player.reset_then() self.player.reset_then()
self.then = pygame.time.get_ticks() self.then = pygame.time.get_ticks()
#self.done = not player.PLAYERS[1].is_alive()
now = pygame.time.get_ticks() now = pygame.time.get_ticks()
delta_t = now - self.then delta_t = now - self.then
if delta_t >= 1000: if delta_t >= 1000:
@@ -199,6 +197,12 @@ class InGameState(BaseState):
player.PLAYERS[1].kill() player.PLAYERS[1].kill()
self.done = True self.done = True
if self.cancel and self.time_left > 0:
# If the player pressed escape, force a timeout.
self.time_left = 0
player.PLAYERS[1].kill()
self.done = True
if not self.done: if not self.done:
if self.cursor_x != self.screen_center[0] or self.cursor_y != self.screen_center[1]: if self.cursor_x != self.screen_center[0] or self.cursor_y != self.screen_center[1]:
#p_pos = self.player.get_position() #p_pos = self.player.get_position()
@@ -211,14 +215,6 @@ class InGameState(BaseState):
self.player.set_angle(math_utils.angle_vectors_2D(self.vec_1, vec_2)) self.player.set_angle(math_utils.angle_vectors_2D(self.vec_1, vec_2))
self.player.update() self.player.update()
self.score_text = self.font.render("Puntos: " + str(player.PLAYERS[1].get_score()), True, (0, 0, 0))
if self.time_left > 30:
self.time_text = self.font.render("Tiempo: " + str(self.time_left), True, (0, 0, 0))
else:
self.time_text = self.font.render("Tiempo: " + str(max(self.time_left, 0)), True, (255, 0, 0))
self.wave_text = self.font.render("Oleada: " + str(self.wave), True, (0, 0, 0))
self.recenter_view() self.recenter_view()
elif self.time_left < -3: elif self.time_left < -3:
@@ -239,7 +235,20 @@ class InGameState(BaseState):
# TODO: Destroy all NPC's. # TODO: Destroy all NPC's.
player.PLAYERS[1].revive() player.PLAYERS[1].revive()
if not self.cancel:
# Register scores only if the game ended cleanly.
self.next_transition = VALID_STATES['SCORE'] self.next_transition = VALID_STATES['SCORE']
else:
self.next_transition = VALID_STATES['MENU']
self.cancel = False
self.score_text = self.font.render("Puntos: " + str(player.PLAYERS[1].get_score()), True, (0, 0, 0))
if self.time_left > 30:
self.time_text = self.font.render("Tiempo: " + str(self.time_left), True, (0, 0, 0))
else:
self.time_text = self.font.render("Tiempo: " + str(max(self.time_left, 0)), True, (255, 0, 0))
self.wave_text = self.font.render("Oleada: " + str(self.wave), True, (0, 0, 0))
self.cursor_x = self.screen_center[0] self.cursor_x = self.screen_center[0]
self.cursor_y = self.screen_center[1] self.cursor_y = self.screen_center[1]