gryf/wmdocklib
1
0
Fork 0
mirror of https://github.com/gryf/wmdocklib.git synced 2025-12-18 20:10:23 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bitmap replacement.

Browse Source 
For the existing character in both palettes, but with different color,
there was missing adding the actual replacement for the original one. In
this patch it was fixed. Also, loops has been removed in favor of list
comprehensions.
This commit is contained in:
gryf
2022-05-05 18:48:38 +02:00
parent 222301fa93
commit 1cf858d431
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wmdocklib/helpers.py
View File

@@ -254,10 +254,10 @@ def merge_palettes(pal1, pal2, bitmap_list):
all_chars = pal1.copy()
all_chars.update(pal2)
sub = get_unique_key(all_chars)
temp = []
for line in bitmap_list:
temp.append(line.replace(new_char, sub))
bitmap_list = temp
# remap clashing character to the new one
bitmap_list = [r.replace(new_char, sub) for r in bitmap_list]
# and now remap character with the one found in first palette
bitmap_list = [r.replace(char, new_char) for r in bitmap_list]
pal2[sub] = pal2[new_char]
pal2[new_char] = MARKER
pal2[char] = MARKER
@@ -274,10 +274,7 @@ def merge_palettes(pal1, pal2, bitmap_list):
all_chars = pal1.copy()
all_chars.update(pal2)
sub = get_unique_key(all_chars)
temp = []
for line in bitmap_list:
temp.append(line.replace(char, sub))
bitmap_list = temp
bitmap_list = [r.replace(char, sub) for r in bitmap_list]
pal2[sub] = color
pal2[char] = MARKER
rerun = True