diff --git a/libs/background.py b/libs/background.py index 2f98104..70b9fe7 100644 --- a/libs/background.py +++ b/libs/background.py @@ -26,6 +26,7 @@ class Background: "IMAS_CG": (libs.bg_collabs.imas.Background, 'background/collab/imas_cg', 3), "IMAS_ML": (libs.bg_collabs.imas.Background, 'background/collab/imas_ml', 3), "IMAS_SIDEM": (libs.bg_collabs.imas_sidem.Background, 'background/collab/imas_sidem', 3), + "FUNASSYI": (libs.bg_collabs.funassyi.Background, 'background/collab/funassyi', 5), "DAN": (libs.bg_collabs.dan.Background, 'background/collab/dan', 1), "PRACTICE": (libs.bg_collabs.practice.Background, 'background/collab/practice', 1) } diff --git a/libs/bg_collabs/__init__.py b/libs/bg_collabs/__init__.py index a805137..bbf63b8 100644 --- a/libs/bg_collabs/__init__.py +++ b/libs/bg_collabs/__init__.py @@ -6,3 +6,4 @@ from . import imas from . import dan from . import imas_sidem from . import practice +from . import funassyi diff --git a/libs/bg_objects/don_bg.py b/libs/bg_objects/don_bg.py index 1448ed8..f5f6b1c 100644 --- a/libs/bg_objects/don_bg.py +++ b/libs/bg_objects/don_bg.py @@ -1,3 +1,4 @@ +from libs.animation import Animation from libs.global_data import PlayerNum from libs.texture import TextureWrapper @@ -14,7 +15,8 @@ class DonBGBase: def __init__(self, tex: TextureWrapper, index: int, player_num: PlayerNum, path: str): self.name = f'{index}_{player_num}' tex.load_zip(path, f'donbg/{self.name}') - self.move = tex.get_animation(0) + self.move = Animation.create_move(3000, total_distance=-tex.textures[self.name]['background'].width, loop=True) + self.move.start() self.is_clear = False self.clear_fade = tex.get_animation(1) @@ -97,7 +99,7 @@ class DonBG4(DonBGBase): self.overlay_move.update(current_time_ms) def _draw_textures(self, tex: TextureWrapper, fade: float, y: float): - for i in range(int(5 * tex.screen_scale)): + for i in range(5): tex.draw_texture(self.name, 'background', frame=self.is_clear, fade=fade, x=(i*tex.textures[self.name]['background'].width)+self.move.attribute, y=y) tex.draw_texture(self.name, 'overlay', frame=self.is_clear, fade=fade, x=(i*tex.textures[self.name]['overlay'].width)+self.move.attribute, y=self.overlay_move.attribute+y)