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

Update game.py

Browse Source
This commit is contained in:
Anthony Samms
2025-12-04 00:24:59 -05:00
parent f5f306a595
commit e2d9642d90
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scenes/game.py
View File

@@ -388,10 +388,10 @@ class Player:
note_half_w = tex.textures["notes"]["1"].width // 2 note_half_w = tex.textures["notes"]["1"].width // 2
travel_distance = tex.screen_width - GameScreen.JUDGE_X travel_distance = tex.screen_width - GameScreen.JUDGE_X
base_pixels_per_ms = (note.bpm / 240000 * abs(note.scroll_x) * travel_distance * tex.screen_scale) base_pixels_per_ms = (note.bpm / 240000 * abs(note.scroll_x) * travel_distance)
if base_pixels_per_ms == 0: if base_pixels_per_ms == 0:
base_pixels_per_ms = (note.bpm / 240000 * abs(note.scroll_y) * travel_distance * tex.screen_scale) base_pixels_per_ms = (note.bpm / 240000 * abs(note.scroll_y) * travel_distance)
normal_travel_ms = (travel_distance + note_half_w) / base_pixels_per_ms normal_travel_ms = (travel_distance + note_half_w) / base_pixels_per_ms
@@ -479,11 +479,13 @@ class Player:
for branch in (self.branch_m, self.branch_e, self.branch_n): for branch in (self.branch_m, self.branch_e, self.branch_n):
if branch: if branch:
for section in branch: for section in branch:
for note in section.draw_notes or []: if section.draw_notes:
self.get_load_time(note) for note in section.draw_notes:
self.get_load_time(note)
section.draw_notes = sorted(section.draw_notes, key=lambda n: n.load_ms) section.draw_notes = sorted(section.draw_notes, key=lambda n: n.load_ms)
for note in section.bars or []: if section.bars:
self.get_load_time(note) for note in section.bars:
self.get_load_time(note)
section.bars = sorted(section.bars, key=lambda n: n.load_ms) section.bars = sorted(section.bars, key=lambda n: n.load_ms)
if section.play_notes: if section.play_notes:
self.end_time = max(self.end_time, section.play_notes[-1].hit_ms) self.end_time = max(self.end_time, section.play_notes[-1].hit_ms)
@@ -511,7 +513,7 @@ class Player:
def get_position_x(self, note, current_ms): def get_position_x(self, note, current_ms):
if self.delay_start: if self.delay_start:
current_ms = self.delay_start current_ms = self.delay_start
speedx = note.bpm / 240000 * note.scroll_x * (tex.screen_width - GameScreen.JUDGE_X) * tex.screen_scale speedx = note.bpm / 240000 * note.scroll_x * (tex.screen_width - GameScreen.JUDGE_X)
return GameScreen.JUDGE_X + (note.hit_ms - current_ms) * speedx return GameScreen.JUDGE_X + (note.hit_ms - current_ms) * speedx