Atlas/Atlas-Install
1
0
Fork 0
mirror of https://github.com/Faraphel/Atlas-Install.git synced 2025-07-06 12:48:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed an issue where ImageFont couldn't read directly from a Path object, and set CT_ICON_SIZE constant to 128 instead of hardcoding 128

Browse source
This commit is contained in:
Faraphel 2022-07-14 15:49:03 +02:00
parent 2f71615ef3
commit ea4a1d293e
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/mkw/Cup.py
View file

@ -21,14 +21,17 @@ class Cup:
Get the default cticon for this cup Get the default cticon for this cup
:return: the default cticon :return: the default cticon
""" """
ct_icon = Image.new("RGBA", (128, 128)) from source.mkw.ModConfig import CT_ICON_SIZE
ct_icon = Image.new("RGBA", (CT_ICON_SIZE, CT_ICON_SIZE))
default_font_path = str(mod_config.get_default_font().resolve())
draw = ImageDraw.Draw(ct_icon) draw = ImageDraw.Draw(ct_icon)
draw.text( draw.text(
(4, 4), (4, 4),
"CT", "CT",
(255, 165, 0), (255, 165, 0),
font=ImageFont.truetype(mod_config.get_default_font(), 90), font=ImageFont.truetype(default_font_path, 90),
stroke_width=2, stroke_width=2,
stroke_fill=(0, 0, 0) stroke_fill=(0, 0, 0)
) )
@ -36,7 +39,7 @@ class Cup:
(5, 80), (5, 80),
f"{self.cup_id:03}", f"{self.cup_id:03}",
(255, 165, 0), (255, 165, 0),
font=ImageFont.truetype(mod_config.get_default_font(), 60), font=ImageFont.truetype(default_font_path, 60),
stroke_width=2, stroke_width=2,
stroke_fill=(0, 0, 0) stroke_fill=(0, 0, 0)
) )

12
source/mkw/ModConfig.py
View file

@ -9,6 +9,9 @@ from source.mkw.Track import Track
import json import json
CT_ICON_SIZE: int = 128
# representation of the configuration of a mod # representation of the configuration of a mod
class ModConfig: class ModConfig:
__slots__ = ("name", "path", "nickname", "variant", "region", "tags_prefix", "tags_suffix", __slots__ = ("name", "path", "nickname", "variant", "region", "tags_prefix", "tags_suffix",
@ -203,7 +206,7 @@ class ModConfig:
if self.enable_random_cup: icon_names.append("random") if self.enable_random_cup: icon_names.append("random")
for icon_name in icon_names: for icon_name in icon_names:
yield Image.open(self.get_mod_directory() / f"{icon_name}.png").resize((128, 128)) yield Image.open(self.get_mod_directory() / f"_CUPS/{icon_name}.png").resize((CT_ICON_SIZE, CT_ICON_SIZE))
def get_custom_cticons(self) -> Generator[Image.Image, None, None]: def get_custom_cticons(self) -> Generator[Image.Image, None, None]:
""" """
@ -211,7 +214,7 @@ class ModConfig:
:return: :return:
""" """
for cup in self.get_cups(): for cup in self.get_cups():
yield cup.get_cticon(mod_config=self).resize((128, 128)) yield cup.get_cticon(mod_config=self).resize((CT_ICON_SIZE, CT_ICON_SIZE))
def get_cticons(self) -> Generator[Image.Image, None, None]: def get_cticons(self) -> Generator[Image.Image, None, None]:
""" """
@ -227,7 +230,6 @@ class ModConfig:
Return the default font for creating ct_icons Return the default font for creating ct_icons
:return: the path to the default font file :return: the path to the default font file
""" """
# TODO: make it customizable
return Path("./assets/SuperMario256.ttf") return Path("./assets/SuperMario256.ttf")
def get_full_cticon(self) -> Image.Image: def get_full_cticon(self) -> Image.Image:
@ -237,7 +239,7 @@ class ModConfig:
""" """
cticons = list(self.get_cticons()) cticons = list(self.get_cticons())
full_cticon = Image.new("RGBA", (128 * len(cticons), 128)) full_cticon = Image.new("RGBA", (CT_ICON_SIZE * len(cticons), CT_ICON_SIZE))
for i, cticon in enumerate(cticons): full_cticon.paste(cticon, (i * 128, 0)) for i, cticon in enumerate(cticons): full_cticon.paste(cticon, (i * CT_ICON_SIZE, 0))
return full_cticon return full_cticon