robob/PyTaiko
1
0
Fork 0
mirror of https://github.com/Yonokid/PyTaiko.git synced 2026-02-04 19:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update game.py

Browse Source
This commit is contained in:
Anthony Samms
2025-10-20 08:42:56 -04:00
parent f6c2586bc4
commit 7cb2f23ee8
1 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scenes/game.py
View File

@@ -62,10 +62,6 @@ class GameScreen:
self.sound_kat = audio.load_sound(sounds_dir / "hit_sounds" / str(global_data.hit_sound) / "ka.ogg", 'hitsound_kat') self.sound_kat = audio.load_sound(sounds_dir / "hit_sounds" / str(global_data.hit_sound) / "ka.ogg", 'hitsound_kat')
def init_tja(self, song: Path, difficulty: int): def init_tja(self, song: Path, difficulty: int):
if song == Path(''):
self.start_ms = get_current_ms()
self.tja = None
else:
self.tja = TJAParser(song, start_delay=self.start_delay, distance=SCREEN_WIDTH - GameScreen.JUDGE_X) self.tja = TJAParser(song, start_delay=self.start_delay, distance=SCREEN_WIDTH - GameScreen.JUDGE_X)
if self.tja.metadata.bgmovie != Path() and self.tja.metadata.bgmovie.exists(): if self.tja.metadata.bgmovie != Path() and self.tja.metadata.bgmovie.exists():
self.movie = VideoPlayer(self.tja.metadata.bgmovie) self.movie = VideoPlayer(self.tja.metadata.bgmovie)
@@ -77,7 +73,6 @@ class GameScreen:
self.song_music = audio.load_music_stream(self.tja.metadata.wave, 'song') self.song_music = audio.load_music_stream(self.tja.metadata.wave, 'song')
self.player_1 = Player(self.tja, global_data.player_num, difficulty) self.player_1 = Player(self.tja, global_data.player_num, difficulty)
if self.tja is not None:
self.start_ms = (get_current_ms() - self.tja.metadata.offset*1000) self.start_ms = (get_current_ms() - self.tja.metadata.offset*1000)
def on_screen_start(self): def on_screen_start(self):
@@ -93,14 +88,9 @@ class GameScreen:
self.init_tja(global_data.selected_song, session_data.selected_difficulty) self.init_tja(global_data.selected_song, session_data.selected_difficulty)
self.song_info = SongInfo(session_data.song_title, session_data.genre_index) self.song_info = SongInfo(session_data.song_title, session_data.genre_index)
self.result_transition = ResultTransition(global_data.player_num) self.result_transition = ResultTransition(global_data.player_num)
self.bpm = 120
if self.tja is not None:
subtitle = self.tja.metadata.subtitle.get(global_data.config['general']['language'].lower(), '') subtitle = self.tja.metadata.subtitle.get(global_data.config['general']['language'].lower(), '')
self.bpm = self.tja.metadata.bpm self.bpm = self.tja.metadata.bpm
scene_preset = self.tja.metadata.scene_preset scene_preset = self.tja.metadata.scene_preset
else:
subtitle = ''
scene_preset = ''
self.background = Background(global_data.player_num, self.bpm, scene_preset=scene_preset) self.background = Background(global_data.player_num, self.bpm, scene_preset=scene_preset)
self.transition = Transition(session_data.song_title, subtitle, is_second=True) self.transition = Transition(session_data.song_title, subtitle, is_second=True)
self.allnet_indicator = AllNetIcon() self.allnet_indicator = AllNetIcon()
@@ -113,7 +103,8 @@ class GameScreen:
audio.unload_all_music() audio.unload_all_music()
self.song_started = False self.song_started = False
self.end_ms = 0 self.end_ms = 0
self.movie = None if self.movie is not None:
self.movie.stop()
if self.background is not None: if self.background is not None:
self.background.unload() self.background.unload()
return next_screen return next_screen
@@ -167,7 +158,6 @@ class GameScreen:
current_time = get_current_ms() current_time = get_current_ms()
self.transition.update(current_time) self.transition.update(current_time)
self.current_ms = current_time - self.start_ms self.current_ms = current_time - self.start_ms
if self.tja is not None:
if (self.current_ms >= self.tja.metadata.offset*1000 + self.start_delay - global_data.config["general"]["judge_offset"]) and not self.song_started: if (self.current_ms >= self.tja.metadata.offset*1000 + self.start_delay - global_data.config["general"]["judge_offset"]) and not self.song_started:
if self.song_music is not None: if self.song_music is not None:
audio.play_music_stream(self.song_music) audio.play_music_stream(self.song_music)
@@ -175,6 +165,7 @@ class GameScreen:
if self.movie is not None: if self.movie is not None:
self.movie.start(current_time) self.movie.start(current_time)
self.song_started = True self.song_started = True
if self.movie is not None: if self.movie is not None:
self.movie.update() self.movie.update()
else: else:
@@ -234,9 +225,6 @@ class GameScreen:
self.result_transition.draw() self.result_transition.draw()
self.allnet_indicator.draw() self.allnet_indicator.draw()
def draw_3d(self):
self.player_1.draw_3d()
class Player: class Player:
TIMING_GOOD = 25.0250015258789 TIMING_GOOD = 25.0250015258789
TIMING_OK = 75.0750045776367 TIMING_OK = 75.0750045776367
@@ -1028,9 +1016,6 @@ class Player:
anim.draw() anim.draw()
#ray.draw_circle(game_screen.width//2, game_screen.height, 300, ray.ORANGE) #ray.draw_circle(game_screen.width//2, game_screen.height, 300, ray.ORANGE)
def draw_3d(self):
pass
class Judgement: class Judgement:
def __init__(self, type: str, big: bool, ms_display: Optional[float]=None): def __init__(self, type: str, big: bool, ms_display: Optional[float]=None):
self.type = type self.type = type