Skip to content

Commit 6cfffd9

Browse files
Y3drkY3drk
committed
Finish pop-up works correctly, "static" variables in car added
1 parent ae8c23d commit 6cfffd9

File tree

3 files changed

+71
-13
lines changed

3 files changed

+71
-13
lines changed

‎car.py‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66

77

88
class Car(pg.sprite.Sprite):
9+
AIR_RESISTANCE = 0.05
10+
TURNING_CAPABILITY = 6
11+
FRONT_BOUNCE = 6
12+
BACK_BOUNCE = 8
13+
FRONT_BASE_ACC = 0.1
14+
BACK_BASE_ACC = 0.03
15+
916
def __init__(self, id, position, speed, direction, rotation, engine, name, curr_map: Map):
1017
pg.sprite.Sprite.__init__(self)
1118
self.id = id
@@ -51,13 +58,13 @@ def update(self, dt):
5158
self.position.add(self.speed * cos(radians(self.direction)), self.speed * sin(radians(self.direction)))
5259
else:
5360
if self.speed * (1 + self.boosters["speed"][0]) > 0:
54-
self.position.subtract((self.speed * (1 + self.boosters["speed"][0]) + 6) * cos(radians(self.direction)),
55-
(self.speed * (1 + self.boosters["speed"][0]) + 6) * sin(radians(self.direction)))
61+
self.position.subtract((self.speed * (1 + self.boosters["speed"][0]) + Car.FRONT_BOUNCE) * cos(radians(self.direction)),
62+
(self.speed * (1 + self.boosters["speed"][0]) + Car.FRONT_BOUNCE) * sin(radians(self.direction)))
5663
else:
57-
self.position.add((self.speed * (1 + self.boosters["speed"][0]) + 8) * cos(radians(self.direction)),
58-
(self.speed * (1 + self.boosters["speed"][0]) + 8) * sin(radians(self.direction)))
64+
self.position.add((self.speed * (1 + self.boosters["speed"][0]) + Car.BACK_BOUNCE) * cos(radians(self.direction)),
65+
(self.speed * (1 + self.boosters["speed"][0]) + Car.BACK_BOUNCE) * sin(radians(self.direction)))
5966

60-
self.speed = -(self.speed * (1 + self.boosters["speed"][0])) * 0.05
67+
self.speed = -(self.speed * (1 + self.boosters["speed"][0])) * Car.AIR_RESISTANCE
6168

6269
self.collision_facilitator = [True, pg.time.get_ticks() * 8]
6370

@@ -95,14 +102,14 @@ def move(self, dt):
95102

96103
if self.speed > 0:
97104
# print(self.speed, self.speed * (0.1 + self.speed * 0.01))
98-
self.speed -= (self.speed * (1 + self.boosters["speed"][0])) * (0.1 + (self.speed * (1 + self.boosters["speed"][0])) * 0.01) # v drogi i v*v powietrza //static variables -NEEDED!
105+
self.speed -= (self.speed * (1 + self.boosters["speed"][0])) * (Car.FRONT_BASE_ACC + (self.speed * (1 + self.boosters["speed"][0])) * 0.2 * Car.AIR_RESISTANCE) # v drogi i v*v powietrza //static variables -NEEDED!
99106
elif self.speed < 0:
100107
self.speed += (self.speed * (1 + self.boosters["speed"][0])) * (
101-
0.03 + (self.speed * (1 + self.boosters["speed"][0])) * 0.05) # v drogi i v*v powietrza
108+
Car.BACK_BASE_ACC + (self.speed * (1 + self.boosters["speed"][0])) * Car.AIR_RESISTANCE) # v drogi i v*v powietrza
102109

103110
def rotate_left(self, dt):
104111
if self.speed != 0:
105-
self.direction = (self.direction - (6 + self.boosters["turning"][0]) * (self.speed * (1 + self.boosters["speed"][0])) * self.rotation / (
112+
self.direction = (self.direction - (Car.TURNING_CAPABILITY + self.boosters["turning"][0]) * (self.speed * (1 + self.boosters["speed"][0])) * self.rotation / (
106113
dt ** 2)) % 360
107114

108115
if self.direction < 0:
@@ -115,7 +122,7 @@ def rotate_left(self, dt):
115122

116123
def rotate_right(self, dt):
117124
if self.speed != 0:
118-
self.direction = (self.direction + (6 + self.boosters["turning"][0]) * (self.speed * (1 + self.boosters["speed"][0])) * self.rotation / (
125+
self.direction = (self.direction + (Car.TURNING_CAPABILITY + self.boosters["turning"][0]) * (self.speed * (1 + self.boosters["speed"][0])) * self.rotation / (
119126
dt ** 2)) % 360
120127
if self.direction > 360:
121128
self.direction -= 360

‎data/Records.csv‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,31 @@ supra_new,map1,7308,Player 1
978978
supra_new,map1,8085,Player 1
979979
supra_new,map1,36237,Player 1
980980
supra_new,map1,10925,Player 1
981+
supra_new,map1,23513,Player 1
982+
supra_new,map1,43766,Player 1
983+
supra_new,map1,27293,Player 1
984+
supra_new,map1,33199,Player 1
985+
supra_new,map1,31812,Player 1
986+
supra_new,map1,49257,Player 1
987+
supra_new,map1,25662,Player 1
988+
supra_new,map1,14104,Player 1
989+
supra_new,map1,12098,Player 1
990+
supra_new,map1,4346,Player 1
991+
supra_new,map1,9829,Player 1
992+
supra_new,map1,14055,Player 1
993+
supra_new,map1,13496,Player 1
994+
supra_new,map1,7929,Player 1
995+
supra_new,map1,15244,Player 1
996+
supra_new,map1,42696,Player 1
997+
supra_new,map1,9487,Player 1
998+
supra_new,map1,8126,Player 1
999+
ferrari458,map1,10450,Player 1
1000+
ferrari458,map1,7727,Player 1
1001+
ferrari458,map1,20292,Player 1
1002+
formula1,map1,19545,Player 1
1003+
supra_new,map1,23714,Player 1
1004+
ferrari458,map2,50222,player1
1005+
ferrari458,map2,68142,player1
9811006
supra_new,map1,9085,Player 1
9821007
supra_new,map1,9679,Player 1
9831008
supra_new,map1,39868,Player 1
@@ -1037,4 +1062,29 @@ supra_new,map1,15826,Player 1
10371062
supra_new,map1,13766,Player 1
10381063
supra_new,map1,17639,Player 1
10391064
supra_new,map1,18437,Player 1
1040-
supra_new,map1,11570,Player 1
1065+
supra_new,map1,11570,Player 1
1066+
supra_new,map1,9639,Player 1
1067+
supra_new,map1,7990,Player 1
1068+
supra_new,map1,5592,Player 1
1069+
supra_new,map1,4157,Player 1
1070+
supra_new,map1,18624,Player 1
1071+
supra_new,map1,8280,Player 1
1072+
supra_new,map1,12541,Player 1
1073+
supra_new,map1,10836,Player 1
1074+
supra_new,map1,7920,Player 1
1075+
supra_new,map1,10837,Player 1
1076+
supra_new,map1,18207,Player 1
1077+
supra_new,map1,4144,Player 1
1078+
supra_new,map1,14857,Player 1
1079+
supra_new,map1,8931,Player 1
1080+
supra_new,map1,10715,Player 1
1081+
supra_new,map1,8544,Player 1
1082+
supra_new,map1,8366,Player 1
1083+
supra_new,map1,9756,Player 1
1084+
supra_new,map1,14174,Player 1
1085+
supra_new,map1,10315,Player 1
1086+
supra_new,map1,8290,Player 1
1087+
supra_new,map1,11807,Player 1
1088+
supra_new,map1,19092,Player 1
1089+
supra_new,map1,5073,Player 1
1090+
supra_new,map1,10479,Player 1

‎engine.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def draw(self, surf, times, pressed):
4141

4242
return_button = pg.draw.rect(surf, self.color, self.return_to_menu_rect)
4343
restart_button = pg.draw.rect(surf, self.color, self.restart_rect)
44-
return_text = self.button_font.render("Return",1,(0,0,0))
44+
return_text = self.button_font.render("To menu",1,(0,0,0))
4545
restart_text = self.button_font.render("Restart",1,(0,0,0))
4646
surf.blit(return_text, return_text.get_rect(center = self.return_text_rect.center))
4747
surf.blit(restart_text, restart_text.get_rect(center = self.restart_text_rect.center))
@@ -192,8 +192,9 @@ def run(self):
192192

193193
if curr_map.won == 1:
194194
r = self.results_popup.draw(self.screen, curr_map.times, pressed)
195-
if r < 2:
196-
run = 0
195+
if r == 0:
196+
run = False
197+
elif r == 1:
197198
self.run()
198199

199200
pg.display.flip()

0 commit comments

Comments
 (0)