elous

VMan-2002 · Nov 15, 2023 · da3181c · da3181c
1 parent 9299e30
commit da3181c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/source/Note.hx b/source/Note.hx
@@ -200,17 +200,12 @@ class SwagUIStyle {
 			if (uiStyle.ratings.get("sick-cool") == null)
 				uiStyle.ratings.set("sick-cool", uiStyle.ratings.get("sick"));
 		}
-		//i'll probably use this but not now
-		if (uiStyle.ratings.get("marvelous") == null) {
+		if (uiStyle.ratings.get("marvelous") == null)
 			uiStyle.ratings.set("marvelous", uiStyle.ratings.get("sick"));
-			uiStyle.ratings.set("marvelous-cool", uiStyle.ratings.get("sick-cool"));
-			uiStyle.ratings.set("marvelous-epic", uiStyle.ratings.get("sick-cool"));
-		} else {
-			if (uiStyle.ratings.get("marvelous-cool") == null)
-				uiStyle.ratings.set("marvelous-cool", uiStyle.ratings.get("marvelous"));
-			if (uiStyle.ratings.get("marvelous-epic") == null)
-				uiStyle.ratings.set("marvelous-epic", uiStyle.ratings.get("marvelous-cool"));
-		}
+		if (uiStyle.ratings.get("marvelous-cool") == null)
+			uiStyle.ratings.set("marvelous-cool", uiStyle.ratings.get("sick-cool") == uiStyle.ratings.get("sick") ? uiStyle.ratings.get("marvelous") : uiStyle.ratings.get("sick-cool"));
+		if (uiStyle.ratings.get("marvelous-epic") == null)
+			uiStyle.ratings.set("marvelous-epic", uiStyle.ratings.get("marvelous-cool"));
 		if (uiStyle.ratings.get("good") == null)
 			uiStyle.ratings.set("good", "normal/good");
 		if (uiStyle.ratings.get("bad") == null)

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -2338,16 +2338,15 @@ class PlayState extends MusicBeatState {
 			daRating = 'good';
 			score = 200;
 			goods += 1;
-		} else if (noteDiff > Conductor.safeZoneOffset * 0.08) {
+		} else {
 			score = 350;
 			sicks += 1;
 			if (noteDiff <= Conductor.safeZoneOffset * 0.08)
 				marvelous += 1;
 			else
 				daRating = 'sick';
-			if (Options.instance.noteSplash) {
+			if (Options.instance.noteSplash)
 				grpNoteSplashes.add(new NoteSplash()).playNoteSplash(playerStrums.strumNotes[daNote.strumNoteNum], daNote);
-			}
 		}
 		if (daRating != "marvelous") {
 			songMFC = false;