From 29640a4ef75ef05b9dc956aed61f023709f4c172 Mon Sep 17 00:00:00 2001
From: yugecin <yugecin@users.noreply.github.com>
Date: Sat, 14 Apr 2018 18:21:59 +0200
Subject: [PATCH] show grades next to players

---
 src/yugecin/opsudance/ReplayPlayback.java | 48 ++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/yugecin/opsudance/ReplayPlayback.java b/src/yugecin/opsudance/ReplayPlayback.java
index 1703ceb3..91ec9ff3 100644
--- a/src/yugecin/opsudance/ReplayPlayback.java
+++ b/src/yugecin/opsudance/ReplayPlayback.java
@@ -55,10 +55,14 @@ public class ReplayPlayback {
 	private int currentAccWidth;
 	private final int ACCMAXWIDTH;
 
+	private int c300, c100, c50;
+
 	private Image hitImage;
 	private int hitImageTimer = 0;
 	private boolean missed;
 
+	private Image gradeImage;
+
 	private static final Color missedColor = new Color(0.4f, 0.4f, 0.4f, 1f);
 
 	public ReplayPlayback(DisplayContainer container, Replay replay, HitData hitdata, Color color) {
@@ -115,6 +119,7 @@ public class ReplayPlayback {
 			this.mods = " +" + this.mods;
 			this.modwidth = Fonts.SMALLBOLD.getWidth(this.mods);
 		}
+		updateGradeImage();
 	}
 
 	public void resetFrameIndex() {
@@ -123,6 +128,22 @@ public class ReplayPlayback {
 		nextFrame = replay.frames[frameIndex];
 	}
 
+	private void updateGradeImage() {
+		if (missed) {
+			gradeImage = null;
+			return;
+		}
+
+		boolean silver = (replay.mods & 0x408) > 0 && (replay.mods & 0x200) == 0;
+		GameData.Grade grade = GameData.getGrade(c300, c100, c50, 0, silver);
+
+		if (grade == GameData.Grade.NULL) {
+			gradeImage = null;
+			return;
+		}
+		gradeImage = grade.getSmallImage().getScaledCopy(SQSIZE + 5, SQSIZE + 5);
+	}
+
 	private int HITIMAGETIMEREXPAND = 200;
 	private int HITIMAGETIMERFADESTART = 500;
 	private int HITIMAGETIMERFADEEND = 700;
@@ -192,21 +213,36 @@ public class ReplayPlayback {
 				keydelay[i] -= renderdelta;
 			}
 
+			boolean hitschanged = false;
 			while (!hitdata.acc.isEmpty() && hitdata.acc.getFirst().time <= time) {
 				currentAcc = String.format("%.2f%%", hitdata.acc.removeFirst().acc).replace('.', ',');
 				currentAccWidth = Fonts.SMALLBOLD.getWidth(currentAcc);
 			}
 
+			while (!hitdata.time300.isEmpty() && hitdata.time300.getFirst() <= time) {
+				hitdata.time300.removeFirst();
+				c300++;
+				hitschanged = true;
+			}
+
 			while (!hitdata.time100.isEmpty() && hitdata.time100.getFirst() <= time) {
 				hitdata.time100.removeFirst();
 				hitImageTimer = 0;
 				hitImage = GameData.hitResults[GameData.HIT_100].getScaledCopy(SQSIZE + 5, SQSIZE + 5);
+				c100++;
+				hitschanged = true;
 			}
 
 			while (!hitdata.time50.isEmpty() && hitdata.time50.getFirst() <= time) {
 				hitdata.time50.removeFirst();
 				hitImageTimer = 0;
 				hitImage = GameData.hitResults[GameData.HIT_100].getScaledCopy(SQSIZE + 5, SQSIZE + 5);
+				c50++;
+				hitschanged = true;
+			}
+
+			if (hitschanged) {
+				updateGradeImage();
 			}
 
 			if (time >= hitdata.combobreaktime) {
@@ -216,13 +252,18 @@ public class ReplayPlayback {
 				hitImage = GameData.hitResults[GameData.HIT_MISS].getScaledCopy(SQSIZE + 5, SQSIZE + 5);
 			}
 		}
+		Color fadecolor = new Color(1f, 1f, 1f, color.a);
 		int xpos = SQSIZE * 5;
 		Fonts.SMALLBOLD.drawString(xpos + ACCMAXWIDTH - currentAccWidth - 10, ypos, currentAcc, new Color(.4f, .4f, .4f, color.a));
 		xpos += ACCMAXWIDTH;
+		if (gradeImage != null) {
+			gradeImage.draw(xpos, ypos, fadecolor);
+		}
+		xpos += SQSIZE + 10;
 		Fonts.SMALLBOLD.drawString(xpos, ypos, this.player, color);
 		xpos += playerwidth;
 		if (!this.mods.isEmpty()) {
-			Fonts.SMALLBOLD.drawString(xpos, ypos, this.mods, new Color(1f, 1f, 1f, color.a));
+			Fonts.SMALLBOLD.drawString(xpos, ypos, this.mods, fadecolor);
 			xpos += modwidth;
 		}
 		xpos += 10;
@@ -258,6 +299,7 @@ public class ReplayPlayback {
 	public static class HitData {
 
 		int combobreaktime = -1;
+		LinkedList<Integer> time300 = new LinkedList();
 		LinkedList<Integer> time100 = new LinkedList();
 		LinkedList<Integer> time50 = new LinkedList();
 		LinkedList<AccData> acc = new LinkedList();
@@ -266,6 +308,7 @@ public class ReplayPlayback {
 			try (InputStream in = new FileInputStream(file)) {
 				int lasttime = -1;
 				int lastcombo = 0;
+				int last300 = 0;
 				int last100 = 0;
 				int last50 = 0;
 				while (true) {
@@ -294,6 +337,9 @@ public class ReplayPlayback {
 						last100 = this100;
 						break;
 					case 3:
+						int this300 = ByteBuffer.wrap(_time).getInt();
+						spread(time300, lasttime, this300 - last300);
+						last300 = this300;
 						break;
 					case 5:
 						int this50 = ByteBuffer.wrap(_time).getInt();