Merge pull request #186 from magickale/gen3-scoring

updated leaderboard logic
This commit is contained in:
Anthony Samms
2025-12-26 21:04:07 -05:00
committed by GitHub

View File

@@ -864,13 +864,11 @@ class ScoreHistory:
tex.draw_texture('leaderboard', 'shinuchi_ura', index=self.long) tex.draw_texture('leaderboard', 'shinuchi_ura', index=self.long)
else: else:
tex.draw_texture('leaderboard', 'shinuchi', index=self.long) tex.draw_texture('leaderboard', 'shinuchi', index=self.long)
tex.draw_texture('leaderboard', 'pts', color=ray.WHITE, index=self.long)
case ScoreMethod.GEN3: case ScoreMethod.GEN3:
if self.curr_difficulty == Difficulty.URA:
tex.draw_texture('leaderboard', 'normal', index=self.long)
else:
tex.draw_texture('leaderboard', 'normal', index=self.long) tex.draw_texture('leaderboard', 'normal', index=self.long)
tex.draw_texture('leaderboard', 'pts', color=ray.BLACK, index=self.long)
tex.draw_texture('leaderboard', 'pts', color=ray.WHITE, index=self.long)
tex.draw_texture('leaderboard', 'difficulty', frame=self.curr_difficulty, index=self.long) tex.draw_texture('leaderboard', 'difficulty', frame=self.curr_difficulty, index=self.long)
for i in range(4): for i in range(4):
@@ -890,7 +888,11 @@ class ScoreHistory:
margin = tex.skin_config["score_info_counter_margin"].x margin = tex.skin_config["score_info_counter_margin"].x
for i in range(len(counter)): for i in range(len(counter)):
if j == 0: if j == 0:
tex.draw_texture('leaderboard', 'counter', frame=int(counter[i]), x=-((len(counter) * tex.skin_config["score_info_counter_margin"].width) // 2) + (i * tex.skin_config["score_info_counter_margin"].width), color=ray.WHITE, index=self.long) match global_data.config["general"]["score_method"]:
case ScoreMethod.SHINUCHI:
tex.draw_texture('leaderboard', 'counter', frame=int(counter[i]), x=-((len(counter) * tex.skin_config["score_info_counter_margin"].width) // 2) + (i * tex.skin_config["score_info_counter_margin"].width), color=ray.WHITE, index=self.long)
case ScoreMethod.GEN3:
tex.draw_texture('leaderboard', 'counter', frame=int(counter[i]), x=-((len(counter) * tex.skin_config["score_info_counter_margin"].width) // 2) + (i * tex.skin_config["score_info_counter_margin"].width), color=ray.BLACK, index=self.long)
else: else:
tex.draw_texture('leaderboard', 'judge_num', frame=int(counter[i]), x=-(len(counter) - i) * margin, y=j*tex.skin_config["score_info_bg_offset"].y) tex.draw_texture('leaderboard', 'judge_num', frame=int(counter[i]), x=-(len(counter) - i) * margin, y=j*tex.skin_config["score_info_bg_offset"].y)