Update Judgment

engine/play/FlickNote.cpp

@@ -29,8 +29,8 @@ class FlickNote : public Archetype {
 	SonolusApi complete(let t = times.now) {
 		FUNCBEGIN
 		var res = 0, res2 = 0;
-		IF (Abs(t - beat) <= judgment.bad) res = 3, res2 = 2; FI
-		IF (Abs(t - beat) <= judgment.perfect) res = 1, res2 = 1; FI
+		IF (t == inputTimeMax) res = 3, res2 = 2; FI
+		IF (t != -1 && t != inputTimeMax) res = 1, res2 = 1; FI
 		EntityInput.set(0, res2);
 		EntityInput.set(1, t - beat);
 		EntityInput.set(3, t - beat);

engine/play/holdNotes/ScratchHoldEnd.cpp

@@ -43,8 +43,8 @@ class SiriusScratchHoldEnd: public Archetype {
 			DestroyParticleEffect(effectId); effectId = 0;
 		} FI
 		var res = 0, res2 = 0;
-		IF (Abs(t - beat) <= judgment.bad) res = 3, res2 = 2; FI
-		IF (Abs(t - beat) <= judgment.perfect) res = 1, res2 = 1; FI
+		IF (t == inputTimeMin) res = 3, res2 = 2; FI
+		IF (t > inputTimeMin) res = 1, res2 = 1; FI
 		EntityInput.set(0, res2);
 		EntityInput.set(1, t - beat);
 		EntityInput.set(3, t - beat);
@@ -72,11 +72,11 @@ class SiriusScratchHoldEnd: public Archetype {
 
 		// 判定主代码
 		IF (times.now < inputTimeMin) Return(0); FI
-		IF (times.now > inputTimeMax) complete(-1); FI
-		IF (isHolding == 1) lastHoldTime = Max(lastHoldTime, beat - judgment.bad + 0.001); FI
+		IF (times.now > inputTimeMax) complete(lastHoldTime); FI
+		IF (isHolding == 1) lastHoldTime = Max(lastHoldTime, inputTimeMin); FI
 		isHolding = findFlickTouch(lane, enLane) != -1;
 		IF (isHolding == 1) lastHoldTime = Max(lastHoldTime, times.now); FI
-		IF (times.now >= beat && lastHoldTime != -1) complete(lastHoldTime); FI
+		IF (times.now >= beat && lastHoldTime > inputTimeMin) complete(lastHoldTime); FI
 		return VOID;
 	}
 

engine/watch/FlickNote.cpp

@@ -18,7 +18,7 @@
         enLane = lane + laneLength - 1;
         Set(EntityInputId, 0, beat);
         PlayScheduled(Clips.Scratch, beat, minSFXDistance);
-		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgePerfectPlus});
+		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgeAuto});
  	    return VOID;
  	}
 

engine/watch/flatNotes/FlatNote.cpp

@@ -20,7 +20,7 @@
         enLane = lane + laneLength - 1;
         Set(EntityInputId, 0, beat);
         PlayScheduled(getClip(), beat, minSFXDistance);
-		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgePerfectPlus});
+		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgeAuto});
  	    return VOID;
  	}
 

engine/watch/holdNotes/HoldEighth.cpp

@@ -17,7 +17,7 @@
         IF (mirror) lane = 14 - lane - laneLength; FI
         enLane = lane + laneLength - 1;
         Set(EntityInputId, 0, beat);
-		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgePerfectPlus});
+		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgeAuto});
  	    return VOID;
  	}
 };

engine/watch/holdNotes/HoldEnd.cpp

@@ -24,7 +24,7 @@
 			PlayLoopedScheduled(Clips.Hold, stBeat),
 			beat
 		);
-		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgePerfectPlus});
+		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgeAuto});
  	    return VOID;
  	}
 

engine/watch/holdNotes/ScratchHoldEnd.cpp

@@ -29,7 +29,7 @@
 			PlayLoopedScheduled(Clips.Hold, stBeat),
 			beat
 		);
-		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgePerfectPlus});
+		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgeAuto});
  	    return VOID;
  	}
 

engine/watch/holdNotes/Sound.cpp

@@ -19,7 +19,7 @@
         enLane = lane + laneLength - 1;
         Set(EntityInputId, 0, beat);
         PlayScheduled(Clips.Sound, beat, minSFXDistance);
-		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgePerfectPlus});
+		Spawn(getArchetypeId(UpdateJudgment), {beat, Sprites.JudgeAuto});
  	    return VOID;
  	}