ENSEEIHT/projet-reseaux-profond
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: autoformatting + small changes

Browse source
This commit is contained in:
Laureηt 2022-04-11 22:49:36 +02:00
parent d45a7aac0a
commit 23814b1026
No known key found for this signature in database
GPG key ID: D88C6B294FD40994
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/garage.py
View file

@ -27,12 +27,12 @@ SECONDARY_COLOR_SLIDER = (380, 380 + TEAM_OFFSET)
ITEM_X = (200, 450, 700)
ITEM_Y = (300, 580, 860)
NB_STICKERS = (3, 3, 0, 0)
NB_STICKERS = (0, 0, 2, 4)
NB_WHEELS = 23
NB_HATS = 23
NB_TEAMS = 2
DELAY = 0.02
DELAY = 0.1
NB_PRIMARY_COLORS = 3
NB_SECONDARY_COLORS = 1
@ -179,7 +179,12 @@ def newCar(model: int, sticker: int, wheel: int, hat: int, team: int, primary_co
time.sleep(DELAY)
# select color, if necessary
if team != old_team or primary_color != old_primary_color[team] or secondary_color != old_secondary_color[team] or model != old_model:
if (
team != old_team
or primary_color != old_primary_color[team]
or secondary_color != old_secondary_color[team]
or model != old_model
):
selectColor(team, primary_color, secondary_color)
time.sleep(DELAY)
@ -191,7 +196,7 @@ def newCar(model: int, sticker: int, wheel: int, hat: int, team: int, primary_co
old_team = team
old_primary_color[old_team] = primary_color
old_secondary_color[old_team] = secondary_color
# goto main menu
tap(BACK_BTN)
time.sleep(DELAY)
@ -199,7 +204,6 @@ def newCar(model: int, sticker: int, wheel: int, hat: int, team: int, primary_co
time.sleep(DELAY)
tap(BACK_BTN)
tap(BACK_BTN)
def generate_loadouts():

4
src/main.py
View file

@ -10,7 +10,7 @@ NB_ETA = 25
NB_ROTATIONS = 10
N_START = 7023
N_START = 0
N_STOP = 0
DELAY_TRANSITION = 0.3
@ -42,7 +42,7 @@ if __name__ == "__main__":
for (i, loadout) in enumerate(loadouts):
# Sauter les N_START premiers
if N_START and i < N_START:
if N_START and i <= N_START:
continue
# Skip après N_STOP loadouts