sweet

Author: superiorshrimp

car.py

@@ -40,7 +40,7 @@ def update(self, dt):
         self.map.handle_boosters(self)
         self.handle_collision_facilitator()
 
-        print("speed b4 everything: ", self.speed)
+        #print("speed b4 everything: ", self.speed)
 
         if self.boosters["freeze"][0]:
             self.speed = 0
@@ -61,8 +61,8 @@ def update(self, dt):
 
                 self.collision_facilitator = [True, pg.time.get_ticks() * 8]
 
-                print("Speed after collision: ", self.speed)
-                print("_-----------------------_")
+                #print("Speed after collision: ", self.speed)
+                #print("_-----------------------_")
 
 
             new_traction = self.map.handle_collision_with_sufraces(self)

data/Records.csv

@@ -994,4 +994,35 @@ supra_new,map1,4839,Player 1
 supra_new,map1,17663,Player 1
 supra_new,map1,12519,Player 1
 supra_new,map1,11388,Player 1
-supra_new,map1,8712,Player 1
+supra_new,map1,8712,Player 1
+supra_new,map1,11441,Player 1
+supra_new,map1,15126,Player 1
+supra_new,map1,17136,Player 1
+supra_new,map1,8882,Player 1
+supra_new,map1,16456,Player 1
+supra_new,map1,9369,Player 1
+supra_new,map1,58079,Player 1
+supra_new,map1,23181,Player 1
+supra_new,map1,10686,Player 1
+supra_new,map1,8875,Player 1
+supra_new,map1,10709,Player 1
+supra_new,map1,10526,Player 1
+supra_new,map1,8537,Player 1
+supra_new,map1,8757,Player 1
+ferrari458,map2,23877,Player 1
+supra_new,map1,10995,Player 1
+supra_new,map1,8518,Player 1
+supra_new,map1,8596,Player 1
+supra_new,map1,8352,Player 1
+supra_new,map1,12518,Player 1
+supra_new,map1,12362,Player 1
+supra_new,map1,10800,Player 1
+supra_new,map1,11034,Player 1
+supra_new,map1,8639,Player 1
+supra_new,map1,19147,Player 1
+supra_new,map1,12420,Player 1
+supra_new,map1,8935,Player 1
+supra_new,map1,12204,Player 1
+supra_new,map1,12819,Player 1
+supra_new,map1,20929,Player 1
+supra_new,map1,13593,Player 1

engine.py

@@ -13,17 +13,23 @@
 from CSVParser import CSVParser
 
 class Results:
-    def __init__(self, x, y, w, h, bg_color, color, font):
+    def __init__(self, x, y, w, h, bg_color, color, font, button_font):
         self.x = x
         self.y = y
         self.w = w
         self.h = h
         self.bg_color = bg_color
         self.color = color
         self.font = font
+        self.button_font = button_font
         self.bg_rect = pg.Rect(x,y,w,h)
         self.finished_rect = pg.Rect(x + 10, y + 10, w - 20, 40)
-    def draw(self, surf, times):
+        self.return_to_menu_rect = pg.Rect(x + 10, y + h - 30, w//2 - 20, 25)
+        self.restart_rect = pg.Rect(x + w//2 + 10, y + h - 30, w//2 - 20, 25)
+        self.return_text_rect = pg.Rect(x + 10, y + h - 30, w//2 - 20, 25)
+        self.restart_text_rect = pg.Rect(x + w//2 + 10, y + h - 30, w//2 - 20, 25)
+        
+    def draw(self, surf, times, pressed):
         pg.draw.rect(surf, self.bg_color, self.bg_rect)
         pg.draw.rect(surf, self.color, self.finished_rect)
         finished = self.font.render("FINISHED!", 1, (0,0,0))
@@ -32,6 +38,30 @@ def draw(self, surf, times):
         for i in range(6):
             t = self.font.render(times[i], 1, (0,0,0))
             surf.blit(t, t.get_rect(center=results[i].center))
+        
+        return_button = pg.draw.rect(surf, self.color, self.return_to_menu_rect)
+        restart_button = pg.draw.rect(surf, self.color, self.restart_rect)
+        return_text = self.button_font.render("Return",1,(0,0,0))
+        restart_text = self.button_font.render("Restart",1,(0,0,0))
+        surf.blit(return_text, return_text.get_rect(center = self.return_text_rect.center))
+        surf.blit(restart_text, restart_text.get_rect(center = self.restart_text_rect.center))
+        if return_button.collidepoint(pg.mouse.get_pos()):
+            return_color = (240,230,140)
+            if pressed:
+                return 0
+        else:
+            return_color = (100,200,255)
+            
+        if restart_button.collidepoint(pg.mouse.get_pos()):
+            restart_color = (240,230,140)
+            if pressed:
+                return 1
+        else:
+            restart_color = (100,200,255)
+            
+        pg.draw.rect(return_text, return_color, [self.x + 10, self.y + self.h - 30, self.w//2 - 20, 25])
+        pg.draw.rect(restart_text, restart_color, [self.x + self.w//2 + 10, self.y + self.h - 30, self.w//2 - 20, 25])
+        return 2
 
 class NitroBar():
     def __init__(self, x, y, w, h, bg_color, color, font):
@@ -63,7 +93,7 @@ def __init__(self, refresh_rate, name, car, map):
         self.car = car
         self.map = map
         self.nitro_bar = NitroBar(5, 5, 250, 40, (240, 230, 140), (100, 100, 255), pg.font.SysFont('Calibri', 35))
-        self.results_popup = Results(1480//2-300//2, 780//2-400//2, 300, 400,  (240, 230, 140), (100, 100, 255), pg.font.SysFont('Calibri', 35))
+        self.results_popup = Results(1480//2-300//2, 780//2-400//2, 300, 400, (240, 230, 140), (100, 100, 255), pg.font.SysFont('Calibri', 35), pg.font.SysFont('Calibri', 25))
 
     def spawn_booster(self, map: Map, dt):
         if random.randrange(0, 256) != 8:
@@ -126,7 +156,6 @@ def run(self):
 
         id, name, engine = CSVParser(None, None, "./data/Cars.csv").read_car_statistics(self.car)
         car = Car(id, Vector2D(50, 100), 0, 0, 10, engine, name, curr_map)
-
         while run:
             dt = self.clock.tick(self.refresh)
             self.screen.blit(map_img, (0, 0))
@@ -151,14 +180,21 @@ def run(self):
 
             self.display_laps(curr_map)
 
+            pressed = False
             for event in pg.event.get():
                 if event.type == pg.QUIT:
                     run = False
+                elif event.type == pg.MOUSEBUTTONDOWN:
+                    pressed = True
 
             ticks = pg.time.get_ticks()
             stopwatch.display_timer(ticks)
 
             if curr_map.won == 1:
-                self.results_popup.draw(self.screen, curr_map.times)
-
+                r = self.results_popup.draw(self.screen, curr_map.times, pressed)
+                if r < 2:
+                    run = 0
+                    self.run()
+                    
             pg.display.flip()
+        pg.display.set_mode((1080, 720))

leaderboard.py

@@ -92,7 +92,7 @@ def run(self):
 			self.cars_options.draw(self.screen)
 			self.maps_options.draw(self.screen)
 			for event in pg.event.get():
-				if self.pointing() and event.type == pg.MOUSEBUTTONDOWN:
+				if event.type == pg.MOUSEBUTTONDOWN and self.pointing():
 					run = False
 					self.screen.fill((0,0,0))
 				car_selected_option = self.cars_options.update(event)

map.py

@@ -171,7 +171,7 @@ def handle_collision_with_sufraces(self, car):
                                 slide.checked = False
 
                             self.increment_laps()
-                        if self.laps_completed == 1:
+                        if self.laps_completed == 6:
                             self.won = 1
                             self.times = ["{minutes:02d}.{seconds:02d}.{millis}".format(minutes=int(self.times[0] / 60000 % 24), millis=self.times[0] % 1000, seconds=int(self.times[0] / 1000 % 60)) for i in range(6)]
 

menu.py

@@ -57,8 +57,9 @@ def run(self):
                     if pos == 0: #play button
                         name, car, map = self.settings.get_settings()
                         engine = Engine(60, name, car, map)
-                        engine.run()
                         run = False
+                        engine.run()
+                        run = True
                     if pos == 1: #leaderboard button
                         leaderboard = Leaderboard()
                         run = False

settings.py

@@ -88,7 +88,6 @@ def run(self):
             self.cars_options.draw(self.screen)
             self.maps_options.draw(self.screen)
 
-            
             if self.save_button.collidepoint(pg.mouse.get_pos()):
                 color = (100,100,255)
             else: