Skip to content

Commit 2365c2b

Browse files
committed
If a song is completed, provide no hints.
1 parent db0b6e3 commit 2365c2b

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

ArchipelagoMuseDash.sln.DotSettings

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/TYPE_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
1010
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SB/@EntryIndexedValue">SB</s:String>
1111
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
12+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
13+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
14+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
15+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
1216
<s:Boolean x:Key="/Default/UserDictionary/Words/=Deactive/@EntryIndexedValue">True</s:Boolean>
1317
<s:Boolean x:Key="/Default/UserDictionary/Words/=deathlink/@EntryIndexedValue">True</s:Boolean>
1418
<s:Boolean x:Key="/Default/UserDictionary/Words/=favourited/@EntryIndexedValue">True</s:Boolean>

ArchipelagoMuseDash/Archipelago/HintHandler.cs

+13-7
Original file line numberDiff line numberDiff line change
@@ -156,21 +156,27 @@ private void HandleHints(Hint[] hints) {
156156
_locationHints[locationName] = hint;
157157
}
158158

159-
if (hint.ReceivingPlayer == _currentPlayerSlot) {
160-
ArchipelagoStatic.ArchLogger.LogDebug("Hinting", $"Got Hint for location: {itemName}, Recieving Player, {hint.Found}");
159+
if (hint.ReceivingPlayer != _currentPlayerSlot)
160+
continue;
161161

162-
if (hint.Found)
163-
_itemsHints.Remove(itemName);
164-
else
165-
_itemsHints[itemName] = hint;
166-
}
162+
ArchipelagoStatic.ArchLogger.LogDebug("Hinting", $"Got Hint for location: {itemName}, Receiving Player, {hint.Found}");
163+
164+
if (hint.Found)
165+
_itemsHints.Remove(itemName);
166+
else
167+
_itemsHints[itemName] = hint;
167168
}
168169
}
169170

170171
private bool TryGetSongHints(MusicInfo info, out string hint) {
171172
if (info == null)
172173
throw new ArgumentException("Tried to get hint on null MusicInfo.");
173174

175+
if (ArchipelagoStatic.SessionHandler.ItemHandler.CompletedSongUids.Contains(info.uid)) {
176+
hint = null;
177+
return false;
178+
}
179+
174180
var sb = new StringBuilder();
175181

176182
if (info.uid == ArchipelagoStatic.SessionHandler.ItemHandler.GoalSong?.uid) {

0 commit comments

Comments
 (0)