fix: display song name instead of roll name

This commit is contained in:
Anna 2020-09-04 16:36:37 -04:00
parent 7d7ff6a54b
commit 85480ff969
1 changed files with 10 additions and 4 deletions

View File

@ -104,7 +104,13 @@ namespace GoodMemory {
continue; continue;
} }
this.AppendIfAcquired(ref overwrite, result, true); uint orchId = resultAction.Data[0];
Orchestrion orch = this.Interface.Data.GetExcelSheet<Orchestrion>().GetRow(orchId);
if (orch == null) {
continue;
}
this.AppendIfAcquired(ref overwrite, result, orch.Name);
} }
} else { } else {
ItemAction action = item.ItemAction?.Value; ItemAction action = item.ItemAction?.Value;
@ -130,10 +136,10 @@ namespace GoodMemory {
return this.tooltipHook.Original(a1, a2, a3); return this.tooltipHook.Original(a1, a2, a3);
} }
private void AppendIfAcquired(ref string txt, Item item, bool useItem = false) { private void AppendIfAcquired(ref string txt, Item item, string name = null) {
string has = this.Functions.HasAcquired(item) ? "Yes" : "No"; string has = this.Functions.HasAcquired(item) ? "Yes" : "No";
if (useItem) { if (name != null) {
txt = $"{txt}\nAcquired ({item.Name}): {has}"; txt = $"{txt}\nAcquired ({name}): {has}";
} else { } else {
txt = $"{txt}\nAcquired: {has}"; txt = $"{txt}\nAcquired: {has}";
} }