3
0
mirror of synced 2024-11-30 18:24:29 +01:00

clean bg mask code, fix hariai bug

This commit is contained in:
Shinrin Ouja Moriking 2024-05-11 20:26:10 -06:00
parent e27e4949b7
commit 12befe49a8
2 changed files with 3 additions and 2 deletions

View File

@ -800,7 +800,7 @@ if __name__ == "__main__":
output_path = os.path.join(args.output, args.name) output_path = os.path.join(args.output, args.name)
mask = args.metadata_mask + 256 if args.bg != None else args.metadata_mask mask = args.metadata_mask
charts_xml = [] charts_xml = []
# Generate list of keysounds based on input charts # Generate list of keysounds based on input charts
@ -912,6 +912,7 @@ if __name__ == "__main__":
if args.bg: if args.bg:
# Create background folder # Create background folder
tex_files['bg_diff_ifs'] = create_bg(output_path, args.musicid, args.bg) tex_files['bg_diff_ifs'] = create_bg(output_path, args.musicid, args.bg)
mask |= 0x00000100 # Required for songs that shows a background
if args.metadata_hariai_is_jacket: if args.metadata_hariai_is_jacket:
mask |= 0x00000020 # The alternate hariai image (set by using 0x800000) is a song jacket instead of a character portrait mask |= 0x00000020 # The alternate hariai image (set by using 0x800000) is a song jacket instead of a character portrait

View File

@ -562,12 +562,12 @@ class Application(tkinter.Frame):
self.tag_image_hariai = tkinter.Label(parent,image=banner) self.tag_image_hariai = tkinter.Label(parent,image=banner)
self.tag_image_hariai.image = banner self.tag_image_hariai.image = banner
self.tag_image_hariai.grid(column=4, row=5,sticky="W",pady = 2,rowspan=13,columnspan=3) self.tag_image_hariai.grid(column=4, row=5,sticky="W",pady = 2,rowspan=13,columnspan=3)
self.hariai_in_game.set(False)
else: else:
tkinter.messagebox.showerror(title="Error", message=self.tr["Image error"]) tkinter.messagebox.showerror(title="Error", message=self.tr["Image error"])
return 0 return 0
widget.delete(0,"end") widget.delete(0,"end")
widget.insert(0,filename) widget.insert(0,filename)
self.hariai_in_game.set(False)