From 54208265980340933469b93ecfc9948dabeb7989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Sat, 26 Mar 2022 17:13:51 +0100 Subject: [PATCH] feat: changing model before wheels --- src/garage.py | 2 +- src/main.py | 2 +- src/utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/garage.py b/src/garage.py index aa9c3bd..cf0b699 100644 --- a/src/garage.py +++ b/src/garage.py @@ -216,7 +216,7 @@ def generate_loadouts(): hats = range(NB_HATS) # create the loadouts iterator - loadouts = itertools.product(models_stickers, wheels, hats, teams, primary_colors, secondary_colors) + loadouts = itertools.product(wheels, models_stickers, hats, teams, primary_colors, secondary_colors) nb_loadouts = sum(NB_STICKERS) * NB_WHEELS * NB_HATS * NB_PRIMARY_COLORS * NB_SECONDARY_COLORS * NB_TEAMS logging.debug(f"number of loadouts: {nb_loadouts}") diff --git a/src/main.py b/src/main.py index 19d212c..da89638 100644 --- a/src/main.py +++ b/src/main.py @@ -52,7 +52,7 @@ if __name__ == "__main__": elapsed = time.time() # unpacking du loadout - ((model, sticker), wheel, hat, team, primary_color, secondary_color) = loadout + (wheel, (model, sticker), hat, team, primary_color, secondary_color) = loadout # modification de la voiture dans le garage garage.newCar(model, sticker, wheel, hat, team, primary_color, secondary_color) diff --git a/src/utils.py b/src/utils.py index 37c63a1..7ea37f0 100644 --- a/src/utils.py +++ b/src/utils.py @@ -137,7 +137,7 @@ def screenshot() -> uuid.UUID: def insert(database: sqlite3.Connection, uuid: uuid.UUID, loadout: tuple, x_rotation: int, y_rotation: int) -> None: - ((model, sticker), wheel, hat, team, primary_color, secondary_color) = loadout + (wheel, (model, sticker), hat, team, primary_color, secondary_color) = loadout database.execute( f"INSERT INTO data VALUES ('{uuid}',{model},{team},{primary_color},{secondary_color},{hat},{sticker},{wheel},{x_rotation},{y_rotation})" )