monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Never download a sprite with Author "Nintendo"

This commit is contained in:
Fabian Dill 2021-04-28 10:31:24 +02:00
parent 4fc1ce77ac
commit 95358bc523
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gui.py
View File

@ -1746,7 +1746,8 @@ def update_sprites(task, on_finish=None):
try: try:
task.update_status("Determining needed sprites") task.update_status("Determining needed sprites")
current_sprites = [os.path.basename(file) for file in glob(sprite_dir + '/*')] current_sprites = [os.path.basename(file) for file in glob(sprite_dir + '/*')]
alttpr_sprites = [(sprite['file'], os.path.basename(urlparse(sprite['file']).path)) for sprite in sprites_arr] alttpr_sprites = [(sprite['file'], os.path.basename(urlparse(sprite['file']).path))
for sprite in sprites_arr if sprite["author"] != "Nintendo"]
needed_sprites = [(sprite_url, filename) for (sprite_url, filename) in alttpr_sprites if filename not in current_sprites] needed_sprites = [(sprite_url, filename) for (sprite_url, filename) in alttpr_sprites if filename not in current_sprites]
alttpr_filenames = [filename for (_, filename) in alttpr_sprites] alttpr_filenames = [filename for (_, filename) in alttpr_sprites]

8
worlds/alttp/Rom.py
View File

@ -548,10 +548,10 @@ class Sprite():
from Patch import get_base_rom_path from Patch import get_base_rom_path
file_name = get_base_rom_path() file_name = get_base_rom_path()
base_rom_bytes = bytes(read_rom(open(file_name, "rb"))) base_rom_bytes = bytes(read_rom(open(file_name, "rb")))
sprite = base_rom_bytes[0x80000:0x87000] Sprite.sprite = base_rom_bytes[0x80000:0x87000]
palette = base_rom_bytes[0xDD308:0xDD380] Sprite.palette = base_rom_bytes[0xDD308:0xDD380]
glove_palette = base_rom_bytes[0xDEDF5:0xDEDF9] Sprite.glove_palette = base_rom_bytes[0xDEDF5:0xDEDF9]
Sprite.base_data = sprite + palette + glove_palette Sprite.base_data = Sprite.sprite + Sprite.palette + Sprite.glove_palette
def from_ap_sprite(self, filedata): def from_ap_sprite(self, filedata):
filedata = filedata.decode("utf-8-sig") filedata = filedata.decode("utf-8-sig")