From a1d7bc558cd1367e9606870752b1ef25c169fa5a Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sun, 16 May 2021 18:30:13 +0200 Subject: [PATCH] preconfigure and sign qusb2snes --- WebHostLib/tracker.py | 2 +- setup.py | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py index 08253e1d..9ee5cd42 100644 --- a/WebHostLib/tracker.py +++ b/WebHostLib/tracker.py @@ -418,7 +418,7 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int): return render_template("playerTracker.html", inventory=inventory, get_item_name_from_id=get_item_name_from_id, player_name=player_name, room=room, icons=icons, checks_done=checks_done, - checks_in_area=seed_checks_in_area, acquired_items={Items.lookup_id_to_name[id] for id in inventory}, + checks_in_area=seed_checks_in_area, acquired_items={lookup_any_item_id_to_name[id] for id in inventory}, small_key_ids=small_key_ids, big_key_ids=big_key_ids, sp_areas=sp_areas, key_locations=player_small_key_locations[tracked_player], big_key_locations=player_big_key_locations[tracked_player], diff --git a/setup.py b/setup.py index 28941930..1c90f819 100644 --- a/setup.py +++ b/setup.py @@ -134,17 +134,31 @@ else: qusb2sneslog = buildfolder / "QUsb2Snes" / "log.txt" if os.path.exists(qusb2sneslog): os.remove(qusb2sneslog) + qusb2snesconfig = buildfolder / "QUsb2Snes" / "config.ini" -if os.path.exists(qusb2snesconfig): - os.remove(qusb2snesconfig) -alttpr_sprites_folder = buildfolder / "data" / "sprites" / "alttpr" -for file in os.listdir(alttpr_sprites_folder): - if file != ".gitignore": - os.remove(alttpr_sprites_folder / file) +# turns on all bridges, disables auto update +with open(qusb2snesconfig, "w") as f: + f.write("""[General] +SendToSet=true +checkUpdateCounter=20 +luabridge=true +LuaBridgeRNGSeed=79120361805329566567327599 +FirstTime=true +sd2snessupport=true +retroarchdevice=true +snesclassic=true""") + if signtool: for exe in exes: print(f"Signing {exe.target_name}") os.system(signtool + os.path.join(buildfolder, exe.target_name)) + print(f"Signing QUsb2Snes") + os.system(signtool + os.path.join(buildfolder, "Qusb2Snes", "QUsb2Snes.exe")) + +alttpr_sprites_folder = buildfolder / "data" / "sprites" / "alttpr" +for file in os.listdir(alttpr_sprites_folder): + if file != ".gitignore": + os.remove(alttpr_sprites_folder / file) manifest_creation()