Fix BestdoriChartConverter generating track motions incorrectly. Add outro time to BestdoriChartConverter.

Assets/Cryville/Common/Buffers/TargetString.cs

@@ -84,7 +84,7 @@ namespace Cryville.Common.Buffers {
 		}
 
 		class Enumerator : IEnumerator<char> {
-			TargetString _self;
+			readonly TargetString _self;
 			int _index = -1;
 			public Enumerator(TargetString self) { _self = self; }
 

Assets/Cryville/Common/IdentifierManager.cs

@@ -10,10 +10,10 @@ namespace Cryville.Common {
 		/// </summary>
 		public static IdentifierManager SharedInstance = new IdentifierManager();
 
-		Dictionary<object, int> _idents = new Dictionary<object, int>();
+		readonly Dictionary<object, int> _idents = new Dictionary<object, int>();
-		List<object> _ids = new List<object>(); 
+		readonly List<object> _ids = new List<object>();
 
-		object _syncRoot = new object();
+		readonly object _syncRoot = new object();
 
 		/// <summary>
 		/// Creates an instance of the <see cref="IdentifierManager" /> class.

Assets/Cryville/Common/Logger.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 
 namespace Cryville.Common {
@@ -40,7 +41,7 @@ namespace Cryville.Common {
 		public static void Create(string key, Logger logger) {
 			Instances[key] = logger;
 			if (logPath != null) {
-				Files[key] = new StreamWriter(logPath + "/" + ((int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds).ToString() + "-" + key + ".log") {
+				Files[key] = new StreamWriter(logPath + "/" + ((int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds).ToString(CultureInfo.InvariantCulture) + "-" + key + ".log") {
 					AutoFlush = true
 				};
 			}

Assets/Cryville/Common/Network/HttpClient.cs

@@ -77,7 +77,7 @@ namespace Cryville.Common.Network {
 					encoding = Encoding.UTF8;
 				payload = encoding.GetBytes(body);
 				headers.Add("Content-Encoding", encoding.EncodingName);
-				headers.Add("Content-Length", payload.Length.ToString());
+				headers.Add("Content-Length", payload.Length.ToString(CultureInfo.InvariantCulture));
 			}
 			string request_line = string.Format(
 				"{0} {1} {2}\r\n", method, uri, Version

Assets/Cryville/Common/Network/TlsClient.cs

@@ -28,7 +28,7 @@ namespace Cryville.Common.Network {
 		}
 
 		private class InternalTlsClient : DefaultTlsClient {
-			string _host;
+			readonly string _host;
 
 			public InternalTlsClient(string host, TlsCrypto crypto) : base(crypto) {
 				_host = host;

Assets/Cryville/Crtr/Chart.cs

@@ -3,6 +3,7 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 
@@ -303,7 +304,7 @@ namespace Cryville.Crtr {
 					var node = RelativeNode;
 					result += "#" + node.Id;
 					if (node.Time != null) result += "@" + node.Time.ToString();
-					if (node.Transition != null) result = "^" + node.Transition.ToString();
+					if (node.Transition != null) result = "^" + ((byte)node.Transition).ToString(CultureInfo.InvariantCulture);
 					if (node.Rate != null) result += "*" + node.Rate.ToString();
 					if (node.Value != null) result += ":" + node.Value.ToString();
 				}
@@ -391,10 +392,12 @@ namespace Cryville.Crtr {
 		public class Judge : ChartEvent {
 			[JsonIgnore]
 			public Identifier Id;
+#pragma warning disable IDE1006
 			public string name {
 				get { return Id.ToString(); }
 				set { Id = new Identifier(value); }
 			}
+#pragma warning restore IDE1006
 
 			public override int Priority {
 				get { return 0; }

Assets/Cryville/Crtr/ChartPlayer.cs

@@ -399,12 +399,16 @@ namespace Cryville.Crtr {
 				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 4)");
 				cbus.BroadcastPostInit();
 				inputProxy.Activate();
-				if (logEnabled) ToggleLogs();
+				if (logEnabled && Settings.Default.HideLogOnPlay) ToggleLogs();
 				Logger.Log("main", 0, "Load/Prehandle", "Cleaning up");
 				GC.Collect();
 				if (disableGC) GarbageCollector.GCMode = GarbageCollector.Mode.Disabled;
 				timer.Stop();
 				Logger.Log("main", 1, "Load/Prehandle", "Prehandling done ({0}ms)", timer.Elapsed.TotalMilliseconds);
+				if (Settings.Default.ClearLogOnPlay) {
+					logs.text = "";
+					Game.MainLogger.Enumerate((level, module, msg) => { });
+				}
 				Game.AudioSequencer.Playing = true;
 				atime0 = Game.AudioClient.BufferPosition;
 				Thread.Sleep((int)((atime0 - Game.AudioClient.Position) * 1000));

Assets/Cryville/Crtr/Components/MeshBase.cs

@@ -22,7 +22,9 @@ namespace Cryville.Crtr.Components {
 		}
 		protected void UpdateZIndex() {
 			if (!mesh.Initialized) return;
-			mesh.Renderer.material.renderQueue = _zindex;
+			foreach (var mat in mesh.Renderer.materials) {
+				mat.renderQueue = _zindex;
+			}
 		}
 	}
 }

Assets/Cryville/Crtr/Components/SectionalGameObject.cs

@@ -110,6 +110,7 @@ namespace Cryville.Crtr.Components {
 			if (body.FrameName != null) AddMat(materials, body.FrameName);
 			if (tail.FrameName != null) AddMat(materials, tail.FrameName);
 			mesh.Renderer.materials = materials.ToArray();
+			UpdateZIndex();
 		}
 
 		void AddMat(List<Material> list, string frame) {

Assets/Cryville/Crtr/Config/InputConfigPanel.cs

@@ -25,13 +25,14 @@ namespace Cryville.Crtr.Config {
 		GameObject m_prefabInputConfigEntry;
 
 		public InputProxy proxy;
-		Dictionary<string, InputConfigPanelEntry> _entries = new Dictionary<string, InputConfigPanelEntry>();
+		readonly Dictionary<string, InputConfigPanelEntry> _entries = new Dictionary<string, InputConfigPanelEntry>();
 
 		string _sel;
 		public void OpenDialog(string entry) {
 			_sel = entry;
 			m_inputDialog.SetActive(true);
 			CallHelper.Purge(m_deviceList);
+			Game.InputManager.EnumerateEvents(ev => { });
 			_recvsrcs.Clear();
 			AddSourceItem(null);
 		}

Assets/Cryville/Crtr/Event/ContainerHandler.cs

@@ -1,6 +1,7 @@
 using Cryville.Crtr.Components;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using UnityEngine;
 
 namespace Cryville.Crtr.Event {
@@ -75,7 +76,7 @@ namespace Cryville.Crtr.Event {
 			get;
 		}
 		public virtual void PreInit() {
-			gogroup = new GameObject(TypeName + ":" + Container.GetHashCode().ToString()).transform;
+			gogroup = new GameObject(TypeName + ":" + Container.GetHashCode().ToString(CultureInfo.InvariantCulture)).transform;
 			if (cs.Parent != null)
 				gogroup.SetParent(cs.Parent.Handler.gogroup, false);
 			a_head = new GameObject("::head").transform;

Assets/Cryville/Crtr/Event/ContainerState.cs

@@ -186,7 +186,6 @@ namespace Cryville.Crtr.Event {
 				child.Value.CopyTo(ct, dest.Children[child.Key]);
 			ValidateChildren();
 
-			RMVPool.ReturnAll();
 			dest.PlayingMotions.Clear();
 			foreach (var m in PlayingMotions) dest.PlayingMotions.Add(m.Key, m.Value);
 		}
@@ -324,11 +323,14 @@ namespace Cryville.Crtr.Event {
 				if (ev.Unstamped is Chart.Motion) {
 					var tev = (Chart.Motion)ev.Unstamped;
 					var mv = RMVPool.Rent(tev.Name);
+					mv.CloneTypeFlag = CloneType;
 					GetMotionValue(tev.Name).CopyTo(mv);
 					PlayingMotions.Add(ev, mv);
 					Callback(ev, callback);
-					if (!ev.Unstamped.IsLong)
+					if (!ev.Unstamped.IsLong) {
 						PlayingMotions.Remove(ev);
+						RMVPool.Return(mv);
+					}
 				}
 				else if (ev.Unstamped is EventContainer) {
 					var cev = (EventContainer)ev.Unstamped;
@@ -348,6 +350,8 @@ namespace Cryville.Crtr.Event {
 						var nev = tev.Original;
 						if (nev is Chart.Motion) {
 							Callback(ev, callback);
+							var mv = PlayingMotions[ev.Origin];
+							if (mv.CloneTypeFlag == CloneType) RMVPool.Return(mv);
 							PlayingMotions.Remove(ev.Origin);
 						}
 						else if (nev is EventContainer) {

Assets/Cryville/Crtr/Extensions/Bestdori/BestdoriChartConverter.cs

@@ -6,6 +6,7 @@ using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 
 namespace Cryville.Crtr.Extensions.Bestdori {
@@ -62,7 +63,7 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 					group.notes.Add(new Chart.Note {
 						time = ToBeatTime(tev.beat),
 						judges = new List<Chart.Judge> { new Chart.Judge { name = tev.flick ? "single_flick" : "single" } },
-						motions = new List<Chart.Motion> { new Chart.Motion { motion = "track:" + tev.lane.ToString() } },
+						motions = new List<Chart.Motion> { new Chart.Motion { motion = "track:" + tev.lane.ToString(CultureInfo.InvariantCulture) } },
 					});
 				}
 				else if (ev is BestdoriChartEvent.Long) {
@@ -75,13 +76,17 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 					};
 					for (int i = 0; i < tev.connections.Count; i++) {
 						BestdoriChartEvent.Connection c = tev.connections[i];
-						note.motions.Add(new Chart.Motion { motion = "track:" + c.lane.ToString() });
+						if (i == 0) {
-						if (i == 0)
 							note.judges.Add(new Chart.Judge { name = "single" });
-						else if (i == tev.connections.Count - 1)
+							note.motions.Add(new Chart.Motion { motion = "track:" + c.lane.ToString(CultureInfo.InvariantCulture) });
-							note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = c.flick ? "longend_flick" : "longend" });
+						}
-						else if (!c.hidden)
+						else {
-							note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = "longnode" });
+							note.motions.Add(new Chart.Motion { time = ToBeatTime(tev.connections[i - 1].beat), endtime = ToBeatTime(c.beat), motion = "track:" + c.lane.ToString(CultureInfo.InvariantCulture) });
+							if (i == tev.connections.Count - 1)
+								note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = c.flick ? "longend_flick" : "longend" });
+							else if (!c.hidden)
+								note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = "longnode" });
+						}
 					}
 					if (c1.beat > endbeat) endbeat = c1.beat;
 					group.notes.Add(note);
@@ -89,7 +94,7 @@ namespace Cryville.Crtr.Extensions.Bestdori {
 				else throw new NotImplementedException("Unsupported event: " + ev.type);
 			}
 			if (bgm == null) throw new FormatException("Chart contains no song");
-			chart.endtime = ToBeatTime(endbeat);
+			chart.endtime = ToBeatTime(endbeat + 4);
 			result.Add(new RawChartResource(string.Format("bang_dream_girls_band_party__{0}__{1}", bgm, StringUtils.TrimExt(file.Name)), chart, new ChartMeta {
 				name = string.Format("Bandori {0} {1}", bgm, StringUtils.TrimExt(file.Name)),
 				author = "©BanG Dream! Project ©Craft Egg Inc. ©bushiroad",

Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs

@@ -23,7 +23,6 @@ namespace Cryville.Crtr.Extensions.Malody {
 				src = JsonConvert.DeserializeObject<MalodyChart>(reader.ReadToEnd());
 			}
 			if (src.meta.mode != 0) throw new NotImplementedException("The chart mode is not supported");
-			if (src.meta.mode_ext.column != 4) throw new NotImplementedException("The key count is not supported");
 
 			var ruleset = "malody!" + MODES[src.meta.mode];
 			if (src.meta.mode == 0) {
@@ -91,14 +90,14 @@ namespace Cryville.Crtr.Extensions.Malody {
 					});
 					chart.motions.Add(new Chart.Motion {
 						time = new BeatTime(ev.beat[0], ev.beat[1], ev.beat[2]),
-						motion = "svm:" + (tev.bpm / baseBpm).ToString()
+						motion = "svm:" + (tev.bpm / baseBpm.Value).ToString(CultureInfo.InvariantCulture)
 					});
 				}
 				else if (ev is MalodyChart.Effect) {
 					var tev = (MalodyChart.Effect)ev;
 					if (tev.scroll != null) group.motions.Add(new Chart.Motion {
 						time = new BeatTime(ev.beat[0], ev.beat[1], ev.beat[2]),
-						motion = "svm:" + tev.scroll.ToString()
+						motion = "svm:" + tev.scroll.Value.ToString(CultureInfo.InvariantCulture)
 					});
 				}
 				else if (ev is MalodyChart.Note) {
@@ -120,7 +119,7 @@ namespace Cryville.Crtr.Extensions.Malody {
 						var rn = new Chart.Note() {
 							time = new BeatTime(tev.beat[0], tev.beat[1], tev.beat[2]),
 							motions = new List<Chart.Motion> {
-								new Chart.Motion() { motion = "track:" + tev.column.ToString() }
+								new Chart.Motion() { motion = "track:" + tev.column.ToString(CultureInfo.InvariantCulture) }
 							},
 						};
 						if (tev.endbeat != null) {

Assets/Cryville/Crtr/InputProxy.cs

@@ -225,7 +225,7 @@ namespace Cryville.Crtr {
 					_etor.ContextCascadeDiscard();
 					if (tv.Type == PdtInternalType.Null) _activeCounts[id.Source]--;
 				}
-				_judge.Cleanup(target, ft, tt);
+				_judge.Cleanup(target, tt);
 				_vecs[pid] = tv;
 			}
 		}

Assets/Cryville/Crtr/Judge.cs

@@ -89,10 +89,12 @@ namespace Cryville.Crtr {
 				int num3 = num + (num2 - num >> 1);
 				int num4 = -list[num3].Definition.stack.CompareTo(stack);
 				if (num4 == 0) num4 = list[num3].StartClip.CompareTo(time);
-				if (num4 >= 0) num2 = num3 - 1;
+				if (num4 > 0) num2 = num3 - 1;
-				else num = num3 + 1;
+				else if (num4 < 0) num = num3 + 1;
+				else if (num != num3) num2 = num3;
+				else return num;
 			}
-			return num + 1;
+			return ~num;
 		}
 		public void Feed(Identifier target, float ft, float tt) {
 			Forward(target, tt);
@@ -135,7 +137,7 @@ namespace Cryville.Crtr {
 			}
 			return false;
 		}
-		public void Cleanup(Identifier target, float ft, float tt) {
+		public void Cleanup(Identifier target, float tt) {
 			Forward(target, tt);
 			var actlist = activeEvs[target];
 			for (int i = actlist.Count - 1; i >= 0; i--) {

Assets/Cryville/Crtr/Motion.cs

@@ -2,6 +2,7 @@ using Cryville.Common;
 using Cryville.Common.Pdt;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using UnityEngine;
 
@@ -170,6 +171,7 @@ namespace Cryville.Crtr {
 	public class RealtimeMotionValue {
 		public Vector AbsoluteValue;
 		List<MotionNode> RelativeNodes;
+		internal byte CloneTypeFlag;
 
 		public RealtimeMotionValue Init(Vector init) {
 			RelativeNodes = new List<MotionNode> {
@@ -433,7 +435,7 @@ namespace Cryville.Crtr {
 		}
 
 		public override string ToString() {
-			return Value.ToString();
+			return Value.ToString(CultureInfo.InvariantCulture);
 		}
 
 		public override float[] ToArray() {
@@ -493,7 +495,7 @@ namespace Cryville.Crtr {
 		}
 
 		public override string ToString() {
-			return Value.ToString();
+			return Value.ToString(CultureInfo.InvariantCulture);
 		}
 
 		public override float[] ToArray() {
@@ -553,7 +555,7 @@ namespace Cryville.Crtr {
 		}
 
 		public override string ToString() {
-			return Value.ToString();
+			return Value.ToString(CultureInfo.InvariantCulture);
 		}
 
 		public override float[] ToArray() {
@@ -648,8 +650,8 @@ namespace Cryville.Crtr {
 
 		public static string ToString(float? w, float? h) {
 			List<string> list = new List<string>();
-			if (w != null) list.Add(w.ToString() + "w");
+			if (w != null) list.Add(w.Value.ToString(CultureInfo.InvariantCulture) + "w");
-			if (h != null) list.Add(h.ToString() + "h");
+			if (h != null) list.Add(h.Value.ToString(CultureInfo.InvariantCulture) + "h");
 			return string.Join("+", list.ToArray());
 		}
 
@@ -744,9 +746,9 @@ namespace Cryville.Crtr {
 
 		public override string ToString() {
 			return string.Format("{0},{1},{2}",
-				x != null ? x.ToString() : "",
+				x != null ? x.Value.ToString(CultureInfo.InvariantCulture) : "",
-				y != null ? y.ToString() : "",
+				y != null ? y.Value.ToString(CultureInfo.InvariantCulture) : "",
-				z != null ? z.ToString() : ""
+				z != null ? z.Value.ToString(CultureInfo.InvariantCulture) : ""
 			);
 		}
 
@@ -915,7 +917,7 @@ namespace Cryville.Crtr {
 		}
 
 		public override string ToString() {
-			return VecPtComp.ToString(xw, xh) + "," + VecPtComp.ToString(yw, yh) + "," + (z != null ? z.ToString() : "");
+			return VecPtComp.ToString(xw, xh) + "," + VecPtComp.ToString(yw, yh) + "," + (z != null ? z.Value.ToString(CultureInfo.InvariantCulture) : "");
 		}
 
 		public override float[] ToArray() {

Assets/Cryville/Crtr/PdtEvaluator.cs

@@ -3,6 +3,7 @@ using Cryville.Common.Pdt;
 using Cryville.Crtr.Event;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using UnityEngine;
 
 namespace Cryville.Crtr {
@@ -298,7 +299,7 @@ namespace Cryville.Crtr {
 				ret.SetArraySuffix(PdtInternalType.String, fc);
 				int o = 0;
 				for (int i = f; i <= t; i++) {
-					var s = pf + i.ToString();
+					var s = pf + i.ToString(CultureInfo.InvariantCulture);
 					ret.SetString(s, o);
 					o += sizeof(int) + s.Length * sizeof(char);
 				}

Assets/Cryville/Crtr/Settings.cs

@@ -175,6 +175,26 @@ namespace Cryville.Crtr {
 			}
 		}
 
+		[Category("debug")]
+		public bool ClearLogOnPlay {
+			get {
+				return PlayerPrefs.GetInt("ClearLogOnPlay", 1) == 1;
+			}
+			set {
+				PlayerPrefs.SetInt("ClearLogOnPlay", value ? 1 : 0);
+			}
+		}
+
+		[Category("debug")]
+		public bool HideLogOnPlay {
+			get {
+				return PlayerPrefs.GetInt("HideLogOnPlay", 1) == 1;
+			}
+			set {
+				PlayerPrefs.SetInt("HideLogOnPlay", value ? 1 : 0);
+			}
+		}
+
 		public void Save() { PlayerPrefs.Save(); }
 		public void Reset() { PlayerPrefs.DeleteAll(); }
 	}

Assets/Cryville/Crtr/SettingsPanel.cs

@@ -36,7 +36,7 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		Dictionary<string, List<PropertyInfo>> _categories = new Dictionary<string, List<PropertyInfo>>();
+		readonly Dictionary<string, List<PropertyInfo>> _categories = new Dictionary<string, List<PropertyInfo>>();
 		public void LoadProperties() {
 			_categories.Clear();
 			_invalidated = false;

Assets/Cryville/Crtr/StampedEvent.cs

@@ -43,7 +43,7 @@ namespace Cryville.Crtr {
 			public override int Priority {
 				get { return StartEvent == null ? 4 : 6; }
 			}
-			protected override int cmpExtra(StampedEvent other) {
+			protected override int CompareExtra(StampedEvent other) {
 				return Equals(StartEvent, other) ? 1 : 0;
 			}
 		}
@@ -75,12 +75,12 @@ namespace Cryville.Crtr {
 			if (u != 0) return u;
 			u = this.Duration.CompareTo(other.Duration);
 			if (u != 0) return u;
-			u = cmpExtra(other);
+			u = CompareExtra(other);
 			if (u != 0) return u;
 			return GetHashCode().CompareTo(other.GetHashCode());
 		}
 
-		protected virtual int cmpExtra(StampedEvent other) {
+		protected virtual int CompareExtra(StampedEvent other) {
 			return 0;
 		}
 	}

Assets/GlobalSuppressions.cs

@@ -9,6 +9,7 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("Style", "IDE0020")]
 [assembly: SuppressMessage("Style", "IDE0038")]
 [assembly: SuppressMessage("Style", "IDE0018")]
+[assembly: SuppressMessage("Style", "IDE0019")]
 
 // Null operators not supported
 [assembly: SuppressMessage("Style", "IDE0016")]
@@ -40,3 +41,6 @@ using System.Diagnostics.CodeAnalysis;
 
 // Local function not supported
 [assembly: SuppressMessage("Style", "IDE0039")]
+
+// Readonly struct not supported
+[assembly: SuppressMessage("Style", "IDE0250")]