From 775e603d4c92f8b6de076450d4cb0e7d1c25fa1e Mon Sep 17 00:00:00 2001 From: Yonokid <37304577+Yonokid@users.noreply.github.com> Date: Sun, 28 Dec 2025 11:45:55 -0500 Subject: [PATCH] add more english --- scenes/entry.py | 7 +++++-- scenes/song_select.py | 40 ++++++++++++++++++++++++++-------------- scenes/title.py | 2 +- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/scenes/entry.py b/scenes/entry.py index afaccdf..23a50c8 100644 --- a/scenes/entry.py +++ b/scenes/entry.py @@ -56,6 +56,9 @@ class EntryScreen(Screen): self.chara = Chara2D(0) self.announce_played = False self.players: list[Optional[EntryPlayer]] = [None, None] + + self.text_cancel = OutlinedText(tex.skin_config["entry_cancel"].text[global_data.config["general"]["language"]], tex.skin_config["entry_cancel"].font_size, ray.WHITE, outline_thickness=4, spacing=-4) + self.text_question = OutlinedText(tex.skin_config["entry_question"].text[global_data.config["general"]["language"]], tex.skin_config["entry_question"].font_size, ray.WHITE, outline_thickness=4, spacing=-1) audio.play_sound('bgm', 'music') def on_screen_end(self, next_screen: str): @@ -164,7 +167,7 @@ class EntryScreen(Screen): tex.draw_texture('side_select', 'box_right', fade=fade) tex.draw_texture('side_select', 'box_center', fade=fade) - tex.draw_texture('side_select', 'question', fade=fade) + self.text_question.draw(outline_color=ray.BLACK, x=tex.skin_config["entry_question"].x-self.text_question.texture.width//2, y=tex.skin_config["entry_question"].y, fade=fade) self.chara.draw(tex.skin_config["chara_entry"].x, tex.skin_config["chara_entry"].y) @@ -180,7 +183,7 @@ class EntryScreen(Screen): else: tex.draw_texture('side_select', '2P_highlight', fade=fade) tex.draw_texture('side_select', '1P2P_outline', index=1, fade=fade) - tex.draw_texture('side_select', 'cancel_text', fade=fade) + self.text_cancel.draw(outline_color=ray.BLACK, x=tex.skin_config["entry_cancel"].x-self.text_cancel.texture.width//2, y=tex.skin_config["entry_cancel"].y, fade=fade) self.nameplate.draw(tex.skin_config["nameplate_entry"].x, tex.skin_config["nameplate_entry"].y) def draw_player_drum(self): diff --git a/scenes/song_select.py b/scenes/song_select.py index 115976f..80d295f 100644 --- a/scenes/song_select.py +++ b/scenes/song_select.py @@ -1219,13 +1219,20 @@ class ModifierSelector: "inverse": "mod_abekobe", "random": "mod_kimagure" } - NAME_MAP = { + NAME_MAP_JA = { "auto": "オート", "speed": "はやさ", "display": "ドロン", "inverse": "あべこべ", "random": "ランダム" } + NAME_MAP_EN = { + "auto": "Auto", + "speed": "Speed", + "display": "Display", + "inverse": "Inverse", + "random": "Random" + } def __init__(self, player_num: PlayerNum): self.player_num = player_num self.mods = fields(Modifiers) @@ -1240,19 +1247,24 @@ class ModifierSelector: self.fade_sideways = tex.get_animation(32, is_copy=True) self.direction = -1 audio.play_sound(f'voice_options_{self.player_num}p', 'sound') - self.text_name = [OutlinedText(ModifierSelector.NAME_MAP[mod.name], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) for mod in self.mods] - self.text_true = OutlinedText('する', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) - self.text_false = OutlinedText('しない', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.language = global_data.config["general"]["language"] + if self.language == 'en': + name_map = ModifierSelector.NAME_MAP_EN + else: + name_map = ModifierSelector.NAME_MAP_JA + self.text_name = [OutlinedText(name_map[mod.name], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) for mod in self.mods] + self.text_true = OutlinedText(tex.skin_config["modifier_text_true"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_false = OutlinedText(tex.skin_config["modifier_text_false"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) self.text_speed = OutlinedText(str(global_data.modifiers[self.player_num].speed), tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) - self.text_kimagure = OutlinedText('きまぐれ', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) - self.text_detarame = OutlinedText('でたらめ', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_kimagure = OutlinedText(tex.skin_config["modifier_text_kimagure"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_detarame = OutlinedText(tex.skin_config["modifier_text_detarame"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) # Secondary text objects for animation - self.text_true_2 = OutlinedText('する', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) - self.text_false_2 = OutlinedText('しない', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_true_2 = OutlinedText(tex.skin_config["modifier_text_true"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_false_2 = OutlinedText(tex.skin_config["modifier_text_false"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) self.text_speed_2 = OutlinedText(str(global_data.modifiers[self.player_num].speed), tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) - self.text_kimagure_2 = OutlinedText('きまぐれ', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) - self.text_detarame_2 = OutlinedText('でたらめ', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_kimagure_2 = OutlinedText(tex.skin_config["modifier_text_kimagure"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_detarame_2 = OutlinedText(tex.skin_config["modifier_text_detarame"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) def update(self, current_ms): self.is_finished = self.is_confirmed and self.move.is_finished @@ -1293,20 +1305,20 @@ class ModifierSelector: if current_value: self.text_true.unload() self.text_true = self.text_true_2 - self.text_true_2 = OutlinedText('する', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_true_2 = OutlinedText(tex.skin_config["modifier_text_true"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) else: self.text_false.unload() self.text_false = self.text_false_2 - self.text_false_2 = OutlinedText('しない', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_false_2 = OutlinedText(tex.skin_config["modifier_text_false"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) elif current_mod.name == 'random': if current_value == 1: self.text_kimagure.unload() self.text_kimagure = self.text_kimagure_2 - self.text_kimagure_2 = OutlinedText('きまぐれ', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_kimagure_2 = OutlinedText(tex.skin_config["modifier_text_kimagure"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) elif current_value == 2: self.text_detarame.unload() self.text_detarame = self.text_detarame_2 - self.text_detarame_2 = OutlinedText('でたらめ', tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) + self.text_detarame_2 = OutlinedText(tex.skin_config["modifier_text_detarame"].text[self.language], tex.skin_config["modifier_text"].font_size, ray.WHITE, outline_thickness=3.5) def left(self): if self.is_confirmed: diff --git a/scenes/title.py b/scenes/title.py index 9267d1e..4b63c8a 100644 --- a/scenes/title.py +++ b/scenes/title.py @@ -43,7 +43,7 @@ class TitleScreen(Screen): self.coin_overlay = CoinOverlay() self.allnet_indicator = AllNetIcon() self.entry_overlay = EntryOverlay() - self.hit_taiko_text = OutlinedText(global_tex.skin_config["hit_taiko_to_start"].text[global_data.config["general"]["language"]], tex.skin_config["hit_taiko_to_start"].font_size, ray.WHITE, spacing=5) + self.hit_taiko_text = OutlinedText(global_tex.skin_config["hit_taiko_to_start"].text[global_data.config["general"]["language"]], tex.skin_config["hit_taiko_to_start"].font_size, ray.WHITE, spacing=5, outline_thickness=4) self.fade_out = tex.get_animation(13) self.text_overlay_fade = tex.get_animation(14)