Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions HollowKnightComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public HollowKnightComponent(LiveSplitState state) {
}
state.Run.Metadata.SetCustomVariable("comparison hits", TimeFormatConstants.DASH);
state.Run.Metadata.SetCustomVariable("delta hits", TimeFormatConstants.DASH);
state.Run.Metadata.SetCustomVariable("item", "");

if (state.CurrentTimingMethod == TimingMethod.RealTime) {
var timingMessage = MessageBox.Show(
Expand Down Expand Up @@ -328,6 +329,8 @@ private SplitterAction NotOrderedSplits(GameState gameState, UIState uIState, st
continue;
} else if (Split.ToString().StartsWith("Menu") || !((gameState == GameState.INACTIVE && uIState == UIState.INACTIVE) || (gameState == GameState.MAIN_MENU))) {
if (CheckSplit(Split, nextScene, sceneName) == SplitterAction.Split) {
// item = split description name without qualifier in parentheses
Model.CurrentState.Run.Metadata.SetCustomVariable("item", HollowKnightSplitSettings.SplitDescriptionName(HollowKnightSplitSettings.GetSplitDescription(Split)));
splitsDone.Add(Split);
lastSplitDone = Split;
menuSplitHelper = false;
Expand Down Expand Up @@ -2389,6 +2392,7 @@ public void OnSplit(object sender, EventArgs e) {
menuSplitCountdown = 20;
store.SplitThisTransition = true;
store.Update();
Model.CurrentState.Run.Metadata.SetCustomVariable("item", "");
}
public Control GetSettingsControl(LayoutMode mode) { return settings; }
public void SetSettings(XmlNode document) {
Expand Down
30 changes: 27 additions & 3 deletions HollowKnightSplitSettings.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.ComponentModel;
using System.Reflection;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using System.Windows.Forms.VisualStyles;

Expand Down Expand Up @@ -28,16 +29,39 @@ private void cboName_SelectedIndexChanged(object sender, EventArgs e) {
public static SplitName GetSplitName(string text) {
foreach (SplitName split in Enum.GetValues(typeof(SplitName))) {
string name = split.ToString();
MemberInfo info = typeof(SplitName).GetMember(name)[0];
DescriptionAttribute description = (DescriptionAttribute)info.GetCustomAttributes(typeof(DescriptionAttribute), false)[0];
string description = GetSplitDescription(split);

if (name.Equals(text, StringComparison.OrdinalIgnoreCase) || description.Description.Equals(text, StringComparison.OrdinalIgnoreCase)) {
if (name.Equals(text, StringComparison.OrdinalIgnoreCase) || description.Equals(text, StringComparison.OrdinalIgnoreCase)) {
return split;
}
}
return SplitName.ManualSplit;
}

/// <summary>
/// Gets the split description of the given split
/// </summary>
/// <param name="split">Split to look up</param>
/// <returns>Split description including both name and qualifier in parentheses</returns>
public static string GetSplitDescription(SplitName split) {
MemberInfo info = typeof(SplitName).GetMember(split.ToString())[0];
DescriptionAttribute description = (DescriptionAttribute)info.GetCustomAttributes(typeof(DescriptionAttribute), false)[0];
return description.Description;
}
/// <summary>
/// Removes the qualifier in parentheses from a split description, producing only the name
/// </summary>
/// <param name="description">Split description</param>
/// <returns>Name without qualifier</returns>
public static string SplitDescriptionName(string description) {
Match m = Regex.Match(description, "(?<name>.+)\\s+\\(.+\\)");
if (m.Success) {
return m.Groups["name"].Value;
} else {
return description;
}
}

private void picHandle_MouseMove(object sender, MouseEventArgs e) {
if (!isDragging) {
if (e.Button == MouseButtons.Left) {
Expand Down