Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Remove judge properties from note event.

Browse Source
This commit is contained in:
PopSlime
2022-10-29 00:46:14 +08:00
parent 745a5d69e4
commit c0d6b89edc
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Cryville/Crtr/Chart.cs
View File

@@ -377,21 +377,13 @@ namespace Cryville.Crtr {
} }
public Note() { public Note() {
SubmitPropSrc("judge", new PropSrc.String(() => judge));
SubmitPropSrc("endjudge", new PropSrc.String(() => endjudge));
SubmitPropSrc("track", new PropSrc.Float(() => { SubmitPropSrc("track", new PropSrc.Float(() => {
var i = motions.FirstOrDefault(m => m.RelativeNode == null && m.Name.MainName == "track"); var i = motions.FirstOrDefault(m => m.RelativeNode == null && m.Name.MainName == "track");
if (i == null) return ((Vec1)ChartPlayer.motionRegistry["track"].InitValue).Value; if (i == null) return ((Vec1)ChartPlayer.motionRegistry["track"].InitValue).Value;
else return ((Vec1)i.AbsoluteValue).Value; else return ((Vec1)i.AbsoluteValue).Value;
})); }));
SubmitPropOp("judge", new PropOp.String(v => judge = v));
SubmitPropOp("endjudge", new PropOp.String(v => endjudge = v));
} }
[Obsolete]
public string judge;
[Obsolete]
public string endjudge;
public override EventList GetEventsOfType(string type) { public override EventList GetEventsOfType(string type) {
switch (type) { switch (type) {
case "judges": return new EventList<Judge>(judges); case "judges": return new EventList<Judge>(judges);

9
Assets/Cryville/Crtr/NoteHandler.cs
View File

@@ -3,7 +3,6 @@ using Cryville.Crtr.Components;
using Cryville.Crtr.Event; using Cryville.Crtr.Event;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using UnityEngine; using UnityEngine;
namespace Cryville.Crtr { namespace Cryville.Crtr {
@@ -66,10 +65,10 @@ namespace Cryville.Crtr {
public override void StartUpdate(ContainerState s) { public override void StartUpdate(ContainerState s) {
base.StartUpdate(s); base.StartUpdate(s);
if (s.CloneType == 16 && Event.judge != null) { /*if (s.CloneType == 16 && Event.judge != null) {
// var etor = new Evaluator(); // var etor = new Evaluator();
//CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.judge], s.Time, etor, patchedJudgeEvents, !Event.@long); //CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.judge], s.Time, etor, patchedJudgeEvents, !Event.@long);
} }*/
} }
public override void Update(ContainerState s, StampedEvent ev) { public override void Update(ContainerState s, StampedEvent ev) {
@@ -172,11 +171,11 @@ namespace Cryville.Crtr {
#endif #endif
} }
else if (s.CloneType == 16) { else if (s.CloneType == 16) {
if (Event.endjudge != null) { /*if (Event.endjudge != null) {
//var etor = new Evaluator(); //var etor = new Evaluator();
//CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.endjudge], ps.Time, etor, patchedJudgeEvents, true); //CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.endjudge], ps.Time, etor, patchedJudgeEvents, true);
} }
cs.Bus.IssuePatch(patchedJudgeEvents.Cast<StampedEvent>()); cs.Bus.IssuePatch(patchedJudgeEvents.Cast<StampedEvent>());*/
} }
OpenAnchor("tail"); OpenAnchor("tail");
base.EndUpdate(s); base.EndUpdate(s);